[pve-devel] [PATCH container] Remove mknod call from pre-start hook

[Fabian Grünbichler]

Since lxc.autodev defaults to 1, LXC will mount /dev as
tmpfs an populate it. The removed code was unnecessary,
since the device node was not accessable in the container
anyway. A /dev mountpoint is mounted into the rootfs and
accessable under its mountpoint, even if there is no
associated /dev node in the container.

To make matters worse, there was no cleanup for this device
node, which made all but the first boot of containers with
a configured /dev mountpoint fail until the host itself was
rebooted.
---
 src/lxc-pve-prestart-hook | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/src/lxc-pve-prestart-hook b/src/lxc-pve-prestart-hook
index 1ba957f..46fee04 100755
--- a/src/lxc-pve-prestart-hook
+++ b/src/lxc-pve-prestart-hook
@@ -81,29 +81,8 @@ __PACKAGE__->register_method ({
 	    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);
-
-	    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");
-		}
-	    }
-	};
-
 	PVE::LXC::foreach_mountpoint($conf, $setup_mountpoint);
 
-	PVE::LXC::foreach_mountpoint($conf, $setup_cgroup_device);
-
 	my $lxc_setup = PVE::LXC::Setup->new($conf, $rootdir);
 	$lxc_setup->pre_start_hook();
 	return undef;
-- 
2.1.4