diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-10-30 19:16:06 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-10-30 19:16:06 +0000 |
| commit | 1c5d3c384b1c9e07b42e50c483e50ea5016fce7a (patch) | |
| tree | 7f1e533f517a6ce71566f5be1a85fe180b927be3 /lib | |
| parent | b6257d488a463a0668b6ea2b48101c6a1a969d0a (diff) | |
| download | drakiso-1c5d3c384b1c9e07b42e50c483e50ea5016fce7a.tar drakiso-1c5d3c384b1c9e07b42e50c483e50ea5016fce7a.tar.gz drakiso-1c5d3c384b1c9e07b42e50c483e50ea5016fce7a.tar.bz2 drakiso-1c5d3c384b1c9e07b42e50c483e50ea5016fce7a.tar.xz drakiso-1c5d3c384b1c9e07b42e50c483e50ea5016fce7a.zip | |
do not use qq() if not needed
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/MDV/Draklive/Initrd.pm | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/MDV/Draklive/Initrd.pm b/lib/MDV/Draklive/Initrd.pm index 56c5cd3..ecd73a3 100644 --- a/lib/MDV/Draklive/Initrd.pm +++ b/lib/MDV/Draklive/Initrd.pm @@ -216,13 +216,13 @@ sub create_initrd_scriptlet { "sh -c 'umount /proc/bus/usb 2>/dev/null'", "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->{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}), + if_($live->{mount}{root}, "sh -c 'rmdir $initrdroot$live->{prefix}{live}{mnt}$live->{mount}{root}'"), + "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 { "sh -c 'mv $initrdroot$live->{prefix}{live}{mnt}/$_->{list} $live->{prefix}{live}{mnt}/'" } grep { $_->{list} } @{$live->{mount}{dirs} || []}), + "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'", + "rmdir $initrdroot$live->{prefix}{live}{mnt}", "nash-mount -o mode=0755 -t tmpfs /dev /dev", - qq(sh -c 'mv $initrdroot/dev/* /dev/'), + "sh -c 'mv $initrdroot/dev/* /dev/'", if_($live->{system}{initrd_post}, deref_array($live->{system}{initrd_post})), "")); } |