mountpoint_mount: remove unused parameter $ms

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 9d2ea4fc0ae0c40377307689349eec92c79531d8..d1a4ea690521f0c0cdf0416c40aa531487aa5eed 100644 (file)
--- a/src/PVE/LXC.pm
+++ b/src/PVE/LXC.pm
@@ -1923,7 +1923,7 @@ sub dettach_loops {
 
 
 sub mountpoint_mount {
-    my ($ms, $mountpoint, $rootdir, $storage_cfg, $loopdevs) = @_;
+    my ($mountpoint, $rootdir, $storage_cfg, $loopdevs) = @_;
 
     my $volid = $mountpoint->{volume};
     my $mount = $mountpoint->{mp};

diff --git a/src/PVE/LXC/Create.pm b/src/PVE/LXC/Create.pm
index b46ee7064f85abe42d12d12b0afdc5181ca17bcd..9cb52e36d291c341cea5f6067175e529ad771972 100644 (file)
--- a/src/PVE/LXC/Create.pm
+++ b/src/PVE/LXC/Create.pm
@@ -202,7 +202,6 @@ sub create_rootfs {
     my $image_path = PVE::Storage::path($storage_cfg, $volid);
     my $mountpoint_path = "/var/lib/lxc/$vmid/rootfs";
     my $mountpoint = { volume => $volid, mp => "/" };
-    my $ms = "rootfs";
 
     eval {
         PVE::Storage::activate_volumes($storage_cfg, [$volid]);
@@ -213,7 +212,7 @@ sub create_rootfs {
            PVE::Tools::run_command($cmd);
        }
 
-        PVE::LXC::mountpoint_mount($ms, $mountpoint, $mountpoint_path, $storage_cfg, $loopdevs);
+        PVE::LXC::mountpoint_mount($mountpoint, $mountpoint_path, $storage_cfg, $loopdevs);
 
         restore_and_configure($vmid, $archive, $mountpoint_path, $conf, $password, $restore);
     };

diff --git a/src/lxc-pve-mount-hook b/src/lxc-pve-mount-hook
index 2f8f2867762b03e8e1c00eba5e56311c492aec07..8e5c0578f769a857bec34fe013ef58165c641f43 100755 (executable)
--- a/src/lxc-pve-mount-hook
+++ b/src/lxc-pve-mount-hook
@@ -92,7 +92,7 @@ __PACKAGE__->register_method ({
            my ($ms, $mountpoint) = @_;
 
            return if $ms eq 'rootfs';
-           PVE::LXC::mountpoint_mount($ms, $mountpoint, $rootdir, $storage_cfg, $loopdevs);
+           PVE::LXC::mountpoint_mount($mountpoint, $rootdir, $storage_cfg, $loopdevs);
        };
 
        my $setup_cgroup_device = sub {