diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-10-30 19:10:18 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-10-30 19:10:18 +0000 |
| commit | b6257d488a463a0668b6ea2b48101c6a1a969d0a (patch) | |
| tree | 5da2b4bd07c6e69b0984eeef4ece4b7068e7527c /lib/MDV/Draklive | |
| parent | 58056ab9e27e4bdcacbdd449e2893f8d7ed40426 (diff) | |
| download | drakiso-b6257d488a463a0668b6ea2b48101c6a1a969d0a.tar drakiso-b6257d488a463a0668b6ea2b48101c6a1a969d0a.tar.gz drakiso-b6257d488a463a0668b6ea2b48101c6a1a969d0a.tar.bz2 drakiso-b6257d488a463a0668b6ea2b48101c6a1a969d0a.tar.xz drakiso-b6257d488a463a0668b6ea2b48101c6a1a969d0a.zip | |
do not hardcode /live
Diffstat (limited to 'lib/MDV/Draklive')
| -rw-r--r-- | lib/MDV/Draklive/Initrd.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm index b427270..56c5cd3 100644 --- a/lib/MDV/Draklive/Initrd.pm +++ b/lib/MDV/Draklive/Initrd.pm @@ -217,10 +217,10 @@ sub create_initrd_scriptlet { "umount /proc", "pivot_root $target $target$initrdroot", if_($live->{mount}{root}, qq(sh -c 'rmdir $initrdroot$live->{prefix}{live}{mnt}$live->{mount}{root}')), - qq(sh -c 'if [ -d $initrdroot/live/modules ]; then cd $initrdroot/live/modules; for i in `ls -1`; do mkdir -p /live/modules/\$i; mount -n --move \$i /live/modules/\$i; rmdir \$i; done; rmdir $initrdroot/live/modules; fi'), - (map { qq(sh -c 'mv $initrdroot/live/$_->{list} /live/') } grep { $_->{list} } @{$live->{mount}{dirs} || []}), - qq(sh -c 'cd $initrdroot/live; for i in `ls -1`; do [ -d \$i ] || continue; mkdir -p /live/\$i; mount -n --move \$i /live/\$i; rmdir \$i; done'), - qq(rmdir $initrdroot/live), + qq(sh -c 'if [ -d $initrdroot$live->{prefix}{live}{mnt}/modules ]; then cd $initrdroot$live->{prefix}{live}{mnt}/modules; for i in `ls -1`; do mkdir -p $live->{prefix}{live}{mnt}/modules/\$i; mount -n --move \$i $live->{prefix}{live}{mnt}/modules/\$i; rmdir \$i; done; rmdir $initrdroot$live->{prefix}{live}{mnt}/modules; fi'), + (map { qq(sh -c 'mv $initrdroot$live->{prefix}{live}{mnt}/$_->{list} $live->{prefix}{live}{mnt}/') } grep { $_->{list} } @{$live->{mount}{dirs} || []}), + qq(sh -c 'cd $initrdroot$live->{prefix}{live}{mnt}; for i in `ls -1`; do [ -d \$i ] || continue; mkdir -p $live->{prefix}{live}{mnt}/\$i; mount -n --move \$i $live->{prefix}{live}{mnt}/\$i; rmdir \$i; done'), + qq(rmdir $initrdroot$live->{prefix}{live}{mnt}), "nash-mount -o mode=0755 -t tmpfs /dev /dev", qq(sh -c 'mv $initrdroot/dev/* /dev/'), if_($live->{system}{initrd_post}, deref_array($live->{system}{initrd_post})), |