diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-10-30 19:05:19 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-10-30 19:05:19 +0000 |
| commit | 231bb2f0b5fc69fa313e95cf3ddd5d0e06678e07 (patch) | |
| tree | d1b9cb5c5c56d34f95f7358f72d1a775570c50cf /lib/MDV/Draklive | |
| parent | 2141a48bd441c048980c16fb58f2751e59db2910 (diff) | |
| download | drakiso-231bb2f0b5fc69fa313e95cf3ddd5d0e06678e07.tar drakiso-231bb2f0b5fc69fa313e95cf3ddd5d0e06678e07.tar.gz drakiso-231bb2f0b5fc69fa313e95cf3ddd5d0e06678e07.tar.bz2 drakiso-231bb2f0b5fc69fa313e95cf3ddd5d0e06678e07.tar.xz drakiso-231bb2f0b5fc69fa313e95cf3ddd5d0e06678e07.zip | |
do not remove /live/union if not existing
Diffstat (limited to 'lib/MDV/Draklive')
| -rw-r--r-- | lib/MDV/Draklive/Initrd.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm index bf13508..0d98f74 100644 --- a/lib/MDV/Draklive/Initrd.pm +++ b/lib/MDV/Draklive/Initrd.pm @@ -215,7 +215,7 @@ sub create_initrd_scriptlet { "sh -c 'umount /proc/bus/usb 2>/dev/null'", "umount /proc", "pivot_root $target $target/initrd", - q(sh -c 'rmdir /initrd/live/union'), + if_($live->{mount}{root}, qq(sh -c 'rmdir /initrd$live->{prefix}{live}{mnt}$live->{mount}{root}')), 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'), (map { qq(sh -c 'mv /initrd/live/$_->{list} /live/') } grep { $_->{list} } @{$live->{mount}{dirs} || []}), 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'), |