summaryrefslogtreecommitdiffstats
path: root/draklive
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2008-05-15 21:41:21 +0000
committerOlivier Blin <oblin@mandriva.com>2008-05-15 21:41:21 +0000
commita1c2465a28ba474c4229385215b05aeb9fe03d43 (patch)
treedd11376ced79b282d73c4349b3583df81d1706a1 /draklive
parentf0cae6de7edbffaf787a62f601267c16b01714c9 (diff)
downloaddrakiso-a1c2465a28ba474c4229385215b05aeb9fe03d43.tar
drakiso-a1c2465a28ba474c4229385215b05aeb9fe03d43.tar.gz
drakiso-a1c2465a28ba474c4229385215b05aeb9fe03d43.tar.bz2
drakiso-a1c2465a28ba474c4229385215b05aeb9fe03d43.tar.xz
drakiso-a1c2465a28ba474c4229385215b05aeb9fe03d43.zip
skip non-dirs when mount moving to new root
Diffstat (limited to 'draklive')
-rwxr-xr-xdraklive2
1 files changed, 1 insertions, 1 deletions
diff --git a/draklive b/draklive
index f57a205..54795f9 100755
--- a/draklive
+++ b/draklive
@@ -585,7 +585,7 @@ sub create_initrd_scriptlet {
"pivot_root $target $target/initrd",
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 mkdir -p /live/$i; mount -n --move $i /live/$i; rmdir $i; done; rmdir /initrd/live'),
+ q(sh -c 'cd /initrd/live; for i in `ls -1`; do [ -d /live/$i ] || continue; mkdir -p /live/$i; mount -n --move $i /live/$i; rmdir $i; done; rmdir /initrd/live'),
if_($live->{system}{initrd_post}, deref_array($live->{system}{initrd_post})),
""));
}