diff options
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rwxr-xr-x | tools/drakx-in-chroot | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 70261e31a..874d8803c 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,4 +1,6 @@ - do not bypass blkid cache +- drakx-in-chroot: + o export blkid cache Version 15.16 - 28 December 2012 diff --git a/tools/drakx-in-chroot b/tools/drakx-in-chroot index a75699341..6b42f7217 100755 --- a/tools/drakx-in-chroot +++ b/tools/drakx-in-chroot @@ -90,7 +90,8 @@ sys("$sudo mount -t tmpfs none $SLASH_LOCATION/run"); # - Ensure we mount the udev run dir for various extra metadata from udevadm # - If dracut has been used (and thus udev has yummy metadata) make sure # drakx knows about it when running in the chroot -foreach my $dir (qw(initramfs udev)) { +# - Also speedup blkid by using its cache +foreach my $dir (qw(initramfs udev blkid)) { next if !-d "/run/$dir"; mkdir_p("$SLASH_LOCATION/run/$dir"); sys("$sudo mount -o bind /run/$dir $SLASH_LOCATION/run/$dir"); @@ -192,7 +193,7 @@ sub create_initial_devices() { sub umount_all() { my $err; clean_stage2_updates(); - my @procs = ('/proc', '/sys/kernel/debug', '/sys', '/run/udev', '/run/initramfs', '/run'); + my @procs = ('/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; |