From 192955f1c4a6ec61cb2038158bee5b7eca7250a9 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Fri, 28 Dec 2012 19:22:15 +0000
Subject: export blkid cache (small speedup)

---
 tools/drakx-in-chroot | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'tools')

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;
-- 
cgit v1.2.1