diff options
| author | Olivier Blin <blino@mageia.org> | 2012-09-01 22:18:57 +0000 |
|---|---|---|
| committer | Olivier Blin <blino@mageia.org> | 2012-09-01 22:18:57 +0000 |
| commit | 175b6752cfc5131527bf3a0adcea994e65358e1d (patch) | |
| tree | a1605200efe5b255542e1c19fbf274c10a7aa958 /tools | |
| parent | 5fcbc2c12e61c2b91fef354f03de7994005e87a6 (diff) | |
| download | drakx-175b6752cfc5131527bf3a0adcea994e65358e1d.tar drakx-175b6752cfc5131527bf3a0adcea994e65358e1d.tar.gz drakx-175b6752cfc5131527bf3a0adcea994e65358e1d.tar.bz2 drakx-175b6752cfc5131527bf3a0adcea994e65358e1d.tar.xz drakx-175b6752cfc5131527bf3a0adcea994e65358e1d.zip | |
fix debugfs dir path and do not attempt to create it since it is already in sysfs
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/drakx-in-chroot | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index 7264ed30a..4c4e2ec99 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', '/sys/kernel/debug/usb', '/run', $STAGE2_LOCATION_ROOTED, $MEDIA_LOCATION_ROOTED, $prefix_ROOTED; +mkdir_p("$SLASH_LOCATION$_") foreach '/dev', '/dev/usb', '/etc', '/var', '/proc', '/sys', '/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"); @@ -82,7 +82,7 @@ sys("$sudo mount -o bind $repository_uri $SLASH_LOCATION$MEDIA_LOCATION_ROOTED") sys("$sudo mount -t proc none $SLASH_LOCATION/proc"); sys("$sudo mount -t sysfs none $SLASH_LOCATION/sys"); -sys("$sudo mount -t debugfs none $SLASH_LOCATION/sys/kernel/debug/usb"); +sys("$sudo mount -t debugfs none $SLASH_LOCATION/sys/kernel/debug"); sys("$sudo mount -t tmpfs none $SLASH_LOCATION/run"); if (-d "/run/udev") { @@ -194,12 +194,12 @@ sub create_initial_devices() { sub umount_all() { my $err; clean_stage2_updates(); - my @procs = ('/proc', '/sys/kernel/debug/usb', '/sys', '/run/udev', '/run/initramfs', '/run'); + my @procs = ('/proc', '/sys/kernel/debug', '/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; if (-d $dir) { - if (m!/sys/kernel/debug/usb! || begins_with($_, $prefix_ROOTED)) { + if (m!/sys/kernel/debug! || begins_with($_, $prefix_ROOTED)) { system_verbose "$sudo umount $dir 2>/dev/null"; next; } |