From: Dietmar Maurer <dietmar@proxmox.com>
Date: Fri, 21 Aug 2015 15:32:13 +0000 (+0200)
Subject: mountpoint_mount: remove unused parameter $ms
X-Git-Url: https://git.proxmox.com/?p=pve-container.git;a=commitdiff_plain;h=1e8f01bedb3fc4f8a3dfd0eff5e8d0d8474798aa

mountpoint_mount: remove unused parameter $ms
---

diff --git a/src/PVE/LXC.pm b/src/PVE/LXC.pm
index 9d2ea4f..d1a4ea6 100644
--- 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 b46ee70..9cb52e3 100644
--- 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 2f8f286..8e5c057 100755
--- 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 {