# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1250610135 -7200
# Node ID 65dd59012383546035c234e89a015b4c827af566
# Parent  0e169dcb3f737868fabd576ddcd4efd2b624e4ea
mirror-tools/mkpkgiso: avoid warning with loram systems

diff -r 0e169dcb3f73 -r 65dd59012383 mirror-tools/stuff/usr/bin/mkpkgiso
--- a/mirror-tools/stuff/usr/bin/mkpkgiso	Tue Aug 18 17:27:51 2009 +0200
+++ b/mirror-tools/stuff/usr/bin/mkpkgiso	Tue Aug 18 17:42:15 2009 +0200
@@ -207,8 +207,10 @@
 		cat >>$TEMP_DIR/install.sh<<EOF
 [ -d /var/www ] || mkdir -p /var/www
 ln -s \$DIR/website /var/www
-tazpkg list | grep -q ^lighttpd || yes y | tazpkg get-install lighttpd > /dev/null 2>&1
-echo "=> slitaz web site installed in http://localhost/website"
+if [ -d /.usr.rw -o ! -d /usr/.moved ]; then
+  tazpkg list | grep -q ^lighttpd || yes y | tazpkg get-install lighttpd > /dev/null 2>&1
+  echo "=> slitaz web site installed in http://localhost/website"
+fi
 EOF
 	fi;;
 esac
@@ -252,7 +254,7 @@
 	*\ --auto-install\ *)
     	echo -n "Enable auto install"
 		cat >>$TEMP_DIR/install.sh<<EOF
-echo "mount -o ro -t iso9660 LABEL=packages-$PKG_VER /mnt" >> /etc/init.d/local.sh
+echo "[ -f /mnt/install.sh ] || mount -o ro -t iso9660 LABEL=packages-$PKG_VER /mnt" >> /etc/init.d/local.sh
 EOF
 		sed -i "s/rw root/rw config=LABEL=packages-$PKG_VER,install.sh root/" \
 			$TEMP_DIR/boot/isolinux/*.cfg