[pve-devel] [PATCH pve-manger 0/1] Close #1623: replace apt-get to apt

[pve-devel] [PATCH pve-manger 0/1] Close #1623: replace apt-get to apt

[Moayad Almalat]

Signed-off-by: Moayad Almalat <m.almalat@proxmox.com>
---
 PVE/API2/APT.pm    |  6 +++---
 PVE/API2/Nodes.pm  |  6 +++---
 PVE/CLI/pveceph.pm |  4 ++--
 bin/pveupgrade     | 10 +++++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index 2db620aa..01688ed1 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -275,7 +275,7 @@ __PACKAGE__->register_method({
     name => 'update_database', 
     path => 'update', 
     method => 'POST',
-    description => "This is used to resynchronize the package index files from their sources (apt-get update).",
+    description => "This is used to resynchronize the package index files from their sources (apt update).",
     permissions => {
 	check => ['perm', '/nodes/{node}', [ 'Sys.Modify' ]],
     },
@@ -322,9 +322,9 @@ __PACKAGE__->register_method({
 	    my $aptcfn = "/etc/apt/apt.conf.d/76pveproxy";
 	    PVE::Tools::file_set_contents($aptcfn, $aptconf);
 
-	    my $cmd = ['apt-get', 'update'];
+	    my $cmd = ['apt', 'update'];
 
-	    print "starting apt-get update\n" if !$param->{quiet};
+	    print "starting apt update\n" if !$param->{quiet};
 	    
 	    if ($param->{quiet}) {
 		PVE::Tools::run_command($cmd, outfunc => sub {}, errfunc => sub {});
diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 1b133352..75757230 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -884,7 +884,7 @@ __PACKAGE__->register_method ({
 	    node => get_standard_option('pve-node'),
 	    upgrade => {
 		type => 'boolean',
-		description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
+		description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.",
 		optional => 1,
 		default => 0,
 	    },
@@ -1024,7 +1024,7 @@ __PACKAGE__->register_method ({
 	    node => get_standard_option('pve-node'),
 	    upgrade => {
 		type => 'boolean',
-		description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
+		description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.",
 		optional => 1,
 		default => 0,
 	    },
@@ -1160,7 +1160,7 @@ __PACKAGE__->register_method ({
 	    proxy => get_standard_option('spice-proxy', { optional => 1 }),
 	    upgrade => {
 		type => 'boolean',
-		description => "Deprecated, use the 'cmd' property instead! Run 'apt-get dist-upgrade' instead of normal shell.",
+		description => "Deprecated, use the 'cmd' property instead! Run 'apt dist-upgrade' instead of normal shell.",
 		optional => 1,
 		default => 0,
 	    },
diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm
index af14cbc0..e2c89be2 100755
--- a/PVE/CLI/pveceph.pm
+++ b/PVE/CLI/pveceph.pm
@@ -157,9 +157,9 @@ __PACKAGE__->register_method ({
 
 	local $ENV{DEBIAN_FRONTEND} = 'noninteractive';
 	print "update available package list\n";
-	eval { run_command(['apt-get', '-q', 'update'], outfunc => sub {}, errfunc => sub { print STDERR "$_[0]\n" }) };
+	eval { run_command(['apt', '-q', 'update'], outfunc => sub {}, errfunc => sub { print STDERR "$_[0]\n" }) };
 
-	my @apt_install = qw(apt-get --no-install-recommends -o Dpkg::Options::=--force-confnew install --);
+	my @apt_install = qw(apt --no-install-recommends -o Dpkg::Options::=--force-confnew install --);
 	my @ceph_packages = qw(
 	    ceph
 	    ceph-common
diff --git a/bin/pveupgrade b/bin/pveupgrade
index 0ce01824..cd20fa75 100755
--- a/bin/pveupgrade
+++ b/bin/pveupgrade
@@ -42,13 +42,13 @@ if (!$st || (time() - $st->mtime) > (3*24*3600)) {
 
 } else {
 
-    my $cmdstr = 'apt-get dist-upgrade';
+    my $cmdstr = 'apt dist-upgrade';
 
-    print "Starting system upgrade: apt-get dist-upgrade\n";
+    print "Starting system upgrade: apt dist-upgrade\n";
 
     my $oldlist = PVE::API2::APT->list_updates({ node => $nodename});
 
-    system('apt-get', 'dist-upgrade'); 
+    system('apt', 'dist-upgrade'); 
 
     my $pkglist = PVE::API2::APT->list_updates({ node => $nodename});
 
@@ -88,7 +88,7 @@ __END__
 
 =head1 NAME
 
-pveupgrade - wrapper arournd "apt-get dist-upgrade"
+pveupgrade - wrapper arournd "apt dist-upgrade"
 
 =head1 SYNOPSIS
 
@@ -96,6 +96,6 @@ pveupgrade - wrapper arournd "apt-get dist-upgrade"
 
 =head1 DESCRIPTION
 
-This is a small wrapper around "apt-get dist-upgrade". We use this to
+This is a small wrapper around "apt dist-upgrade". We use this to
 print additional information (kernel restart required?), and
 optionally run an interactive shell after the update (--shell)
-- 
2.20.1

[pve-devel] [PATCH pve-docs 1/1] Close #1623: replace apt-get to apt

[Moayad Almalat]

Signed-off-by: Moayad Almalat <m.almalat@proxmox.com>
---
 local-zfs.adoc               | 4 ++--
 pve-firewall.adoc            | 2 +-
 pve-installation.adoc        | 4 ++--
 pve-package-repos.adoc       | 2 +-
 pve-storage-iscsi.adoc       | 2 +-
 qm-cloud-init.adoc           | 2 +-
 system-software-updates.adoc | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/local-zfs.adoc b/local-zfs.adoc
index fd03e89..0271510 100644
--- a/local-zfs.adoc
+++ b/local-zfs.adoc
@@ -333,10 +333,10 @@ Activate E-Mail Notification
 ZFS comes with an event daemon, which monitors events generated by the
 ZFS kernel module. The daemon can also send emails on ZFS events like
 pool errors. Newer ZFS packages ship the daemon in a separate package,
-and you can install it using `apt-get`:
+and you can install it using `apt`:
 
 ----
-# apt-get install zfs-zed
+# apt install zfs-zed
 ----
 
 To activate the daemon it is necessary to edit `/etc/zfs/zed.d/zed.rc` with your
diff --git a/pve-firewall.adoc b/pve-firewall.adoc
index 7089778..f286018 100644
--- a/pve-firewall.adoc
+++ b/pve-firewall.adoc
@@ -573,7 +573,7 @@ Rejected/Dropped firewall packets don't go to the IPS.
 Install suricata on proxmox host:
 
 ----
-# apt-get install suricata
+# apt install suricata
 # modprobe nfnetlink_queue  
 ----
 
diff --git a/pve-installation.adoc b/pve-installation.adoc
index 0d416ac..5129c14 100644
--- a/pve-installation.adoc
+++ b/pve-installation.adoc
@@ -291,8 +291,8 @@ xref:sysadmin_package_repositories[After configuring the repositories] you need
 to run the following commands:
 
 ----
-# apt-get update
-# apt-get install proxmox-ve
+# apt update
+# apt install proxmox-ve
 ----
 
 Installing on top of an existing Debian installation looks easy, but it presumes
diff --git a/pve-package-repos.adoc b/pve-package-repos.adoc
index 4fcf147..34d1700 100644
--- a/pve-package-repos.adoc
+++ b/pve-package-repos.adoc
@@ -13,7 +13,7 @@ defined in the file `/etc/apt/sources.list` and in `.list` files placed in
 Each line defines a package repository. The preferred source must come first.
 Empty lines are ignored. A `#` character anywhere on a line marks the remainder
 of that line as a comment. The available packages from a repository are acquired
-by running `apt-get update`. Updates can be installed directly using `apt-get`,
+by running `apt update`. Updates can be installed directly using `apt`,
 or via the GUI.
 
 .File `/etc/apt/sources.list`
diff --git a/pve-storage-iscsi.adoc b/pve-storage-iscsi.adoc
index 93975f5..4fcfb92 100644
--- a/pve-storage-iscsi.adoc
+++ b/pve-storage-iscsi.adoc
@@ -19,7 +19,7 @@ http://www.open-iscsi.org/[Open-iSCSI] (`open-iscsi`) package. This is a
 standard Debian package, but it is not installed by default to save
 resources.
 
-  # apt-get install open-iscsi
+  # apt install open-iscsi
 
 Low-level iscsi management task can be done using the `iscsiadm` tool.
 
diff --git a/qm-cloud-init.adoc b/qm-cloud-init.adoc
index 895db9f..6744ccf 100644
--- a/qm-cloud-init.adoc
+++ b/qm-cloud-init.adoc
@@ -45,7 +45,7 @@ Simply install the Cloud-Init packages inside the VM that you want to
 prepare. On Debian/Ubuntu based systems this is as simple as:
 
 ----
-apt-get install cloud-init
+apt install cloud-init
 ----
 
 Already many distributions provide ready-to-use Cloud-Init images (provided
diff --git a/system-software-updates.adoc b/system-software-updates.adoc
index 013e171..f0df410 100644
--- a/system-software-updates.adoc
+++ b/system-software-updates.adoc
@@ -8,12 +8,12 @@ Proxmox provides updates on a regular basis for all repositories. To install
 updates use the web-based GUI or the following CLI commands:
 
 ----
-# apt-get update
-# apt-get dist-upgrade
+# apt update
+# apt dist-upgrade
 ----
 
 NOTE: The APT package management system is very flexible and provides many
-features, see `man apt-get`, or <<Hertzog13>> for additional information.
+features, see `man apt`, or <<Hertzog13>> for additional information.
 
 TIP: Regular updates are essential to get the latest patches and security
 related fixes. Major system upgrades are announced in the {forum}.
-- 
2.20.1

[pve-devel] applied: Re: [PATCH pve-manger 0/1] Close #1623: replace apt-get to apt

[Thomas Lamprecht]

On 07.07.20 12:20, Moayad Almalat wrote:
> Signed-off-by: Moayad Almalat <m.almalat@proxmox.com>
> ---
>  PVE/API2/APT.pm    |  6 +++---
>  PVE/API2/Nodes.pm  |  6 +++---
>  PVE/CLI/pveceph.pm |  4 ++--
>  bin/pveupgrade     | 10 +++++-----
>  4 files changed, 13 insertions(+), 13 deletions(-)
> 
>

applied, thanks!