diff options
| -rw-r--r-- | NEWS | 1 | ||||
| -rwxr-xr-x | draklive | 3 | ||||
| -rw-r--r-- | lib/MDV/Draklive/Initrd.pm | 4 |
3 files changed, 5 insertions, 3 deletions
@@ -1,3 +1,4 @@ +- adapt for usbfs death, change /proc/bus/usb to /sys/kernel/debug/usb - drop harcoded /etc/dracut.conf.d/60-live.conf - unmount /dev when needed @@ -383,11 +383,12 @@ sub mount_system_fs { my ($live) = @_; run_('mount', '-t', 'proc', '/proc', $live->get_system_root . '/proc'); run_('mount', '-t', 'sysfs', '/sys', $live->get_system_root . '/sys'); + run_('mount', '-t', 'debugfs', '/sys/kernel/debug/usb', $live->get_system_root . '/sys/kernel/debug/usb'); } sub umount_system_fs { my ($live) = @_; - eval { fs::mount::umount($live->get_system_root . $_) } foreach qw(/dev /proc/bus/usb /proc /sys); + eval { fs::mount::umount($live->get_system_root . $_) } foreach qw(/dev /proc /sys/kernel/debug/usb /sys); } sub umount_external_fs { diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm index b5ea5a7..a2e8ee1 100644 --- a/lib/MDV/Draklive/Initrd.pm +++ b/lib/MDV/Draklive/Initrd.pm @@ -232,8 +232,8 @@ sub create_initrd_scriptlet { "plymouth --newroot=$target", "echo 0x0100 > /proc/sys/kernel/real-root-dev", "umount /sys", - "sh -c 'umount /proc/bus/usb 2>/dev/null'", - "umount /proc", + "sh -c 'umount /sys/kernel/debug/usb 2>/dev/null'", + "umount /sys/kernel/debug/usb", "pivot_root $target $target$initrdroot", if_($live->{mount}{root}, "sh -c 'rmdir $initrdroot$live->{prefix}{live}{mnt}$live->{mount}{root}'"), (map { $loop_types{$_->{type}}{pivot_clean}->($live, $_, $initrdroot) } grep { $loop_types{$_->{type}}{pivot_clean} } @{$live->{mount}{dirs} || []}), |