From 0d9a251cbfa8c504b3d33b0da5c834a972bee65d Mon Sep 17 00:00:00 2001
From: Olivier Blin <oblin@mandriva.com>
Date: Thu, 30 Oct 2008 19:00:34 +0000
Subject: only move modules list if needed

---
 lib/MDV/Draklive/Initrd.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm
index 8b49f32..ccb54a8 100644
--- a/lib/MDV/Draklive/Initrd.pm
+++ b/lib/MDV/Draklive/Initrd.pm
@@ -218,7 +218,7 @@ sub create_initrd_scriptlet {
                           q(sh -c 'rmdir /initrd/live/union'),
                           q(sh -c 'if [ -d /initrd/live/modules ]; then cd /initrd/live/modules; for i in `ls -1`; do mkdir -p /live/modules/$i; mount -n --move $i /live/modules/$i; rmdir $i; done; rmdir /initrd/live/modules; fi'),
                           q(sh -c 'cd /initrd/live; for i in `ls -1`; do [ -d $i ] || continue; mkdir -p /live/$i; mount -n --move $i /live/$i; rmdir $i; done'),
-                          q(sh -c 'mv /initrd/live/* /live/'),
+                          (map { qq(sh -c 'mv /initrd/live/$_->{list} /live/') } grep { $_->{list} } @{$live->{mount}{dirs} || []}),
                           q(rmdir /initrd/live),
                           "nash-mount -o mode=0755 -t tmpfs /dev /dev",
                           q(sh -c 'mv /initrd/dev/* /dev/'),
-- 
cgit v1.2.1