summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-09-01 19:21:22 +0000
committerThomas Backlund <tmb@mageia.org>2012-09-01 19:21:22 +0000
commite79f028b8685a5a069b242b833eda12ca05f7220 (patch)
tree9ff1d149fe843db5fbe7ed2200bdd42dd14e2ac1
parente515b6e2ed91aabe186e8dbaef54865aa66c6b61 (diff)
downloaddrakiso-e79f028b8685a5a069b242b833eda12ca05f7220.tar
drakiso-e79f028b8685a5a069b242b833eda12ca05f7220.tar.gz
drakiso-e79f028b8685a5a069b242b833eda12ca05f7220.tar.bz2
drakiso-e79f028b8685a5a069b242b833eda12ca05f7220.tar.xz
drakiso-e79f028b8685a5a069b242b833eda12ca05f7220.zip
adapt for usbfs death, change /proc/bus/usb to /sys/kernel/debug/usb
-rw-r--r--NEWS1
-rwxr-xr-xdraklive3
-rw-r--r--lib/MDV/Draklive/Initrd.pm4
3 files changed, 5 insertions, 3 deletions
diff --git a/NEWS b/NEWS
index ffe1903..ed4e7a9 100644
--- a/NEWS
+++ b/NEWS
@@ -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
diff --git a/draklive b/draklive
index d3d9dbe..6e2ba79 100755
--- a/draklive
+++ b/draklive
@@ -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} || []}),