summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2012-09-01 19:38:45 +0000
committerThomas Backlund <tmb@mageia.org>2012-09-01 19:38:45 +0000
commit4fa75e58bdd8f7f528152a341e8fd2214b2c61e7 (patch)
treed484a05dc11cb756bfc0a996c1684a2eb494048f
parent84779a4ad529caf0afa666a2a05978d72316340a (diff)
downloaddrakx-4fa75e58bdd8f7f528152a341e8fd2214b2c61e7.tar
drakx-4fa75e58bdd8f7f528152a341e8fd2214b2c61e7.tar.gz
drakx-4fa75e58bdd8f7f528152a341e8fd2214b2c61e7.tar.bz2
drakx-4fa75e58bdd8f7f528152a341e8fd2214b2c61e7.tar.xz
drakx-4fa75e58bdd8f7f528152a341e8fd2214b2c61e7.zip
- drakx-in-chroot:
o adapt to usbfs death
-rw-r--r--perl-install/NEWS2
-rwxr-xr-xtools/drakx-in-chroot4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 6d7edc587..5c2b6bf01 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakx-in-chroot:
+ o adapt to usbfs death
- boodloader:
o ensure initrds used in combination with kernels with vga= arguments
are regenerated when needed
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot
index 1ef65b62b..8c17cb629 100755
--- a/tools/drakx-in-chroot
+++ b/tools/drakx-in-chroot
@@ -58,7 +58,7 @@ if (-d $SLASH_LOCATION) {
rm_rf($SLASH_LOCATION);
}
-mkdir_p("$SLASH_LOCATION$_") foreach '/dev', '/dev/usb', '/etc', '/var', '/proc', '/sys', '/run', $STAGE2_LOCATION_ROOTED, $MEDIA_LOCATION_ROOTED, $prefix_ROOTED;
+mkdir_p("$SLASH_LOCATION$_") foreach '/dev', '/dev/usb', '/etc', '/var', '/proc', '/sys', '/sys/kernel/debug/usb', '/run', $STAGE2_LOCATION_ROOTED, $MEDIA_LOCATION_ROOTED, $prefix_ROOTED;
sys("$sudo rm -rf $dir") if $ENV{CLEAN};
-e $dir or sys("$sudo mkdir -p $dir");
@@ -193,7 +193,7 @@ sub create_initial_devices() {
sub umount_all() {
my $err;
clean_stage2_updates();
- my @procs = ('/proc/bus/usb', '/proc', '/sys', '/run/udev', '/run/initramfs', '/run');
+ my @procs = ('/proc', '/sys/kernel/debug/usb', '/sys', '/run/udev', '/run/initramfs', '/run');
foreach ((map { "$prefix_ROOTED$_" } @procs, '/dev', ''), @procs, $STAGE2_LOCATION_ROOTED, $LOOP_MOUNT_POINT, $MEDIA_LOCATION_ROOTED, $IMAGE_LOCATION_ROOTED) {
my $dir = "$SLASH_LOCATION$_";
rmdir $dir;