vzdump: use the new run_command variant

[pve-container.git] / src / lxc-pve-mount-hook

diff --git a/src/lxc-pve-mount-hook b/src/lxc-pve-mount-hook
index eb80c9e53889cadc2ae7016ee3dd2b6e2b7421cb..41a25cf54061a361e518be1a2b121e538c0a10c9 100755 (executable)
--- a/src/lxc-pve-mount-hook
+++ b/src/lxc-pve-mount-hook
@@ -2,8 +2,12 @@
 
 use strict;
 use warnings;
+
+exit 0 if $ENV{LXC_NAME} && $ENV{LXC_NAME} !~ /^\d+$/;
+
 use POSIX;
 use File::Path;
+use Fcntl ':mode';
 
 use PVE::SafeSyslog;
 use PVE::Tools;
@@ -85,32 +89,29 @@ __PACKAGE__->register_method ({
        $raw = -f $fn ? PVE::Tools::file_get_contents($fn) : '';
        my $storage_cfg = PVE::Storage::Plugin->parse_config($fn, $raw);
 
-       my $bdevs = PVE::LXC::blockdevices_list();
-       my $loopdevs =  PVE::LXC::loopdevices_list();
-
        my $setup_mountpoint = sub {
            my ($ms, $mountpoint) = @_;
 
            return if $ms eq 'rootfs';
-           PVE::LXC::mountpoint_mount($mountpoint, $rootdir, $storage_cfg, $loopdevs);
+           PVE::LXC::mountpoint_mount($mountpoint, $rootdir, $storage_cfg);
        };
 
        my $setup_cgroup_device = sub {
            my ($ms, $mountpoint) = @_;
 
            my $volid = $mountpoint->{volume};
-           return if !$volid || $volid =~ m|^/dev/.+|;
-
-           my $path = PVE::LXC::mountpoint_mount_path($mountpoint, $storage_cfg, $loopdevs);
-
-           if (-l $path) {
-               $path = readlink($path);
-               $path =~ s/\.\.\/\.\.\//\/dev\//;
-           }
-
-           if ($bdevs->{$path}) {
-               PVE::Tools::run_command(['mknod', '-m', '666', "$rootdir$path", 'b',  $bdevs->{$path}->{major}, $bdevs->{$path}->{minor}]);
-               PVE::LXC::write_cgroup_value("devices", $vmid, "devices.allow", "b $bdevs->{$path}->{major}:$bdevs->{$path}->{minor} rwm");
+           return if !$volid || $volid !~ m|^/dev/.+|;
+
+           my $path = PVE::LXC::mountpoint_mount_path($mountpoint, $storage_cfg);
+
+           my (undef, undef, $mode, undef, undef, undef, $rdev) = stat($path);
+           if ($mode && S_ISBLK($mode) && $rdev) {
+               my $major = int($rdev / 0x100);
+               my $minor = $rdev % 0x100;
+               if ($major != 7) { # must not be a loop device
+                   PVE::Tools::run_command(['mknod', '-m', '666', "$rootdir$path", 'b', $major, $minor]);
+                   PVE::LXC::write_cgroup_value("devices", $vmid, "devices.allow", "b ${major}:${minor} rwm");
+               }
            }
        };