wok diff busybox/receipt @ rev 18838
Up gparted (0.25.0)
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Jan 21 11:45:04 2016 +0100 (2016-01-21) |
parents | 3d18330745fd |
children | d3584f1d2a06 |
line diff
1.1 --- a/busybox/receipt Wed Jan 06 17:56:34 2016 +0100 1.2 +++ b/busybox/receipt Thu Jan 21 11:45:04 2016 +0100 1.3 @@ -180,7 +180,7 @@ 1.4 pre_install() 1.5 { 1.6 local i 1.7 - cp -a /etc/resolv.conf /etc/resolv.conf-busybox-install 1.8 + cp -a $1/etc/resolv.conf $1/etc/resolv.conf-busybox-install 1.9 answer="" 1.10 for i in $(cat "$1$INSTALLED/$PACKAGE/files.list"); do 1.11 [ -f "$1$i" ] || continue 1.12 @@ -204,27 +204,27 @@ 1.13 post_install() 1.14 { 1.15 local i 1.16 - [ -f /etc/resolv.conf-busybox-install ] && 1.17 - mv -f /etc/resolv.conf-busybox-install /etc/resolv.conf 1.18 + [ -f $1/etc/resolv.conf-busybox-install ] && 1.19 + mv -f $1/etc/resolv.conf-busybox-install $1/etc/resolv.conf 1.20 while read i ; do 1.21 [ -f "$1$i-busybox-install" ] || continue 1.22 mv "$1$i-busybox-install" "$1$i" 1.23 done < "$1$INSTALLED/$PACKAGE/files.list" 1.24 chmod 4755 "$1/bin/busybox" 1.25 1.26 - touch $root/etc/daemons.conf 1.27 + touch $1/etc/daemons.conf 1.28 # /etc/daemons.conf (tftp + dnsd + httpd may not be present) 1.29 - if ! grep -q ^DNSD_OPTIONS $root/etc/daemons.conf; then 1.30 - echo '# Domain name server options.' >> $root/etc/daemons.conf 1.31 - echo 'DNSD_OPTIONS="-d"' >> $root/etc/daemons.conf 1.32 - echo '' >> $root/etc/daemons.conf 1.33 + if ! grep -q ^DNSD_OPTIONS $1/etc/daemons.conf; then 1.34 + echo '# Domain name server options.' >> $1/etc/daemons.conf 1.35 + echo 'DNSD_OPTIONS="-d"' >> $1/etc/daemons.conf 1.36 + echo '' >> $1/etc/daemons.conf 1.37 fi 1.38 - if ! grep -q ^TFTPD_OPTIONS $root/etc/daemons.conf; then 1.39 - echo '# Tftp daemon options.' >> $root/etc/daemons.conf 1.40 - echo 'TFTPD_OPTIONS="-r /boot"' >> $root/etc/daemons.conf 1.41 - echo '' >> $root/etc/daemons.conf 1.42 + if ! grep -q ^TFTPD_OPTIONS $1/etc/daemons.conf; then 1.43 + echo '# Tftp daemon options.' >> $1/etc/daemons.conf 1.44 + echo 'TFTPD_OPTIONS="-r /boot"' >> $1/etc/daemons.conf 1.45 + echo '' >> $1/etc/daemons.conf 1.46 fi 1.47 - sed -i "s/copy; 20../copy; $(date +%Y)/" $root/var/www/httpd/404.html 1.48 + sed -i "s/copy; 20../copy; $(date +%Y)/" $1/var/www/httpd/404.html 1.49 } 1.50 1.51 pre_remove()