diff options
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rwxr-xr-x | tools/drakx-in-chroot | 8 |
2 files changed, 4 insertions, 6 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 921d0ed27..4a05be0c4 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- drakx-in-chroot: + o adapt to the fact that stage2 expects a /dev fully populated by udev - package installation: o adapt to URPM-5 o rename "no_suggests" option as "no_recommends" diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index af1e51c1c..47a760b0e 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -85,6 +85,7 @@ sys("$sudo mount -o bind $dir $SLASH_LOCATION$prefix_ROOTED"); $repository_uri ||= $repository_without_arch if !$remote_repository; sys("$sudo mount -o bind $repository_uri $SLASH_LOCATION$MEDIA_LOCATION_ROOTED") if $repository_uri; +sys("$sudo mount --bind /dev $SLASH_LOCATION/dev"); 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"); @@ -109,7 +110,6 @@ if ($disk_iso_repository) { symlinkf('media' . $repository_arch, "$SLASH_LOCATION$IMAGE_LOCATION_ROOTED"); create_initial_symlinks(); -create_initial_devices(); apply_stage2_updates(); @@ -197,14 +197,10 @@ sub create_initial_symlinks() { } } -sub create_initial_devices() { - sys("$sudo cp -a /dev/{mem,null,random,urandom,tty} $SLASH_LOCATION/dev"); -} - sub umount_all() { my $err; clean_stage2_updates(); - my @procs = ('/proc', '/sys/kernel/debug', '/sys', '/run/udev', '/run/blkid', '/run/initramfs', '/run'); + my @procs = (qw(/dev /proc /sys/kernel/debug /sys /run/udev /run/blkid /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; |