wok-6.x rev 3916
mirror-tools/mkpkgiso: avoid warning with loram systems
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Tue Aug 18 17:42:15 2009 +0200 (2009-08-18) |
parents | 0e169dcb3f73 |
children | 8c5c15fc1a40 |
files | mirror-tools/stuff/usr/bin/mkpkgiso |
line diff
1.1 --- a/mirror-tools/stuff/usr/bin/mkpkgiso Tue Aug 18 17:27:51 2009 +0200 1.2 +++ b/mirror-tools/stuff/usr/bin/mkpkgiso Tue Aug 18 17:42:15 2009 +0200 1.3 @@ -207,8 +207,10 @@ 1.4 cat >>$TEMP_DIR/install.sh<<EOF 1.5 [ -d /var/www ] || mkdir -p /var/www 1.6 ln -s \$DIR/website /var/www 1.7 -tazpkg list | grep -q ^lighttpd || yes y | tazpkg get-install lighttpd > /dev/null 2>&1 1.8 -echo "=> slitaz web site installed in http://localhost/website" 1.9 +if [ -d /.usr.rw -o ! -d /usr/.moved ]; then 1.10 + tazpkg list | grep -q ^lighttpd || yes y | tazpkg get-install lighttpd > /dev/null 2>&1 1.11 + echo "=> slitaz web site installed in http://localhost/website" 1.12 +fi 1.13 EOF 1.14 fi;; 1.15 esac 1.16 @@ -252,7 +254,7 @@ 1.17 *\ --auto-install\ *) 1.18 echo -n "Enable auto install" 1.19 cat >>$TEMP_DIR/install.sh<<EOF 1.20 -echo "mount -o ro -t iso9660 LABEL=packages-$PKG_VER /mnt" >> /etc/init.d/local.sh 1.21 +echo "[ -f /mnt/install.sh ] || mount -o ro -t iso9660 LABEL=packages-$PKG_VER /mnt" >> /etc/init.d/local.sh 1.22 EOF 1.23 sed -i "s/rw root/rw config=LABEL=packages-$PKG_VER,install.sh root/" \ 1.24 $TEMP_DIR/boot/isolinux/*.cfg