proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-04-28 23:19:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Close #1623: replace apt-get to apt"

Browse Source 
This reverts commit 19137ed620.
This commit is contained in:
Thomas Lamprecht 2020-07-08 10:55:56 +02:00
parent c262828bed
commit ecddd2e231
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PVE/API2/APT.pm
View File

@ -275,7 +275,7 @@ __PACKAGE__->register_method({
name => 'update_database', name => 'update_database',
path => 'update', path => 'update',
method => 'POST', method => 'POST',
description => "This is used to resynchronize the package index files from their sources (apt update).", description => "This is used to resynchronize the package index files from their sources (apt-get update).",
permissions => { permissions => {
check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]], check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]],
}, },
@ -322,9 +322,9 @@ __PACKAGE__->register_method({
my $aptcfn = "/etc/apt/apt.conf.d/76pveproxy"; my $aptcfn = "/etc/apt/apt.conf.d/76pveproxy";
PVE::Tools::file_set_contents($aptcfn, $aptconf); PVE::Tools::file_set_contents($aptcfn, $aptconf);
my $cmd = ['apt', 'update']; my $cmd = ['apt-get', 'update'];
print "starting apt update\n" if !$param->{quiet}; print "starting apt-get update\n" if !$param->{quiet};
if ($param->{quiet}) { if ($param->{quiet}) {
PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {}); PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {});

6
PVE/API2/Nodes.pm
View File

@ -884,7 +884,7 @@ __PACKAGE__->register_method ({
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
upgrade => { upgrade => {
type => 'boolean', type => 'boolean',
description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.", description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
optional => 1, optional => 1,
default => 0, default => 0,
}, },
@ -1024,7 +1024,7 @@ __PACKAGE__->register_method ({
node => get_standard_option('pve-node'), node => get_standard_option('pve-node'),
upgrade => { upgrade => {
type => 'boolean', type => 'boolean',
description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.", description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
optional => 1, optional => 1,
default => 0, default => 0,
}, },
@ -1160,7 +1160,7 @@ __PACKAGE__->register_method ({
proxy => get_standard_option('spice-proxy', { optional => 1 }), proxy => get_standard_option('spice-proxy', { optional => 1 }),
upgrade => { upgrade => {
type => 'boolean', type => 'boolean',
description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.", description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
optional => 1, optional => 1,
default => 0, default => 0,
}, },

4
PVE/CLI/pveceph.pm
View File

@ -157,9 +157,9 @@ __PACKAGE__->register_method ({
local $ENV{DEBIAN_FRONTEND} = 'noninteractive'; local $ENV{DEBIAN_FRONTEND} = 'noninteractive';
print "update available package list\n"; print "update available package list\n";
eval { run_command(['apt', '-q', 'update'], outfunc => sub {}, errfunc => sub { print STDERR "$_[0]\n" }) }; eval { run_command(['apt-get', '-q', 'update'], outfunc => sub {}, errfunc => sub { print STDERR "$_[0]\n" }) };
my @apt_install = qw(apt --no-install-recommends -o Dpkg::Options::=--force-confnew install --); my @apt_install = qw(apt-get --no-install-recommends -o Dpkg::Options::=--force-confnew install --);
my @ceph_packages = qw( my @ceph_packages = qw(
ceph ceph
ceph-common ceph-common

10
bin/pveupgrade
View File

@ -42,13 +42,13 @@ if (!$st || (time() - $st->mtime) > (3*24*3600)) {
} else { } else {
my $cmdstr = 'apt dist-upgrade'; my $cmdstr = 'apt-get dist-upgrade';
print "Starting system upgrade: apt dist-upgrade\n"; print "Starting system upgrade: apt-get dist-upgrade\n";
my $oldlist = PVE::API2::APT->list_updates({ node => $nodename}); my $oldlist = PVE::API2::APT->list_updates({ node => $nodename});
system('apt', 'dist-upgrade'); system('apt-get', 'dist-upgrade');
my $pkglist = PVE::API2::APT->list_updates({ node => $nodename}); my $pkglist = PVE::API2::APT->list_updates({ node => $nodename});
@ -88,7 +88,7 @@ __END__
=head1 NAME =head1 NAME
pveupgrade - wrapper arournd "apt dist-upgrade" pveupgrade - wrapper arournd "apt-get dist-upgrade"
=head1 SYNOPSIS =head1 SYNOPSIS
@ -96,6 +96,6 @@ pveupgrade - wrapper arournd "apt dist-upgrade"
=head1 DESCRIPTION =head1 DESCRIPTION
This is a small wrapper around "apt dist-upgrade". We use this to This is a small wrapper around "apt-get dist-upgrade". We use this to
print additional information (kernel restart required?), and print additional information (kernel restart required?), and
optionally run an interactive shell after the update (--shell) optionally run an interactive shell after the update (--shell)