summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-10-03 22:34:05 +0000
committerOlivier Blin <oblin@mandriva.com>2007-10-03 22:34:05 +0000
commit1611f83f3d5d36fe94dba1ad6c5dfbc195c460a4 (patch)
treebafb4953ecbe08a4e4e7e4a9439f96c5f0b1a8b7
parent86d2efbae39329e3091493fae4d78a82dcdb9936 (diff)
downloaddraklive-1611f83f3d5d36fe94dba1ad6c5dfbc195c460a4.tar
draklive-1611f83f3d5d36fe94dba1ad6c5dfbc195c460a4.tar.gz
draklive-1611f83f3d5d36fe94dba1ad6c5dfbc195c460a4.tar.bz2
draklive-1611f83f3d5d36fe94dba1ad6c5dfbc195c460a4.tar.xz
draklive-1611f83f3d5d36fe94dba1ad6c5dfbc195c460a4.zip
do not mess / tree if no live modules are used
-rwxr-xr-xdraklive2
1 files changed, 1 insertions, 1 deletions
diff --git a/draklive b/draklive
index 8cb2ef5..75a7635 100755
--- a/draklive
+++ b/draklive
@@ -547,7 +547,7 @@ sub create_initrd_scriptlet {
"umount /proc",
"pivot_root $target $target/initrd",
q(sh -c 'rmdir /initrd/live/union'),
- q(sh -c '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'),
+ 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'),
if_($live->{system}{initrd_post}, deref_array($live->{system}{initrd_post})),
""));