slitaz-tools diff installer/slitaz-installer @ rev 516
tazx: incorrect tux; slitaz installer creates 1008 user
author | Rohit Joshi <jozee@slitaz.org> |
---|---|
date | Wed Nov 10 20:26:12 2010 -0500 (2010-11-10) |
parents | bcf8cdeaf6fc |
children | 7f85db867875 |
line diff
1.1 --- a/installer/slitaz-installer Sun Apr 25 17:23:10 2010 +0200 1.2 +++ b/installer/slitaz-installer Wed Nov 10 20:26:12 2010 -0500 1.3 @@ -120,16 +120,22 @@ 1.4 echo -e "\nUsing files from cdrom ($CDROM)..." 1.5 echo "XXX" 1.6 sleep 2 1.7 - else 1.8 - # We may be in LiveUSB mode 1.9 - if [ -d /home/boot ]; then 1.10 - echo "XXX" && echo 60 1.11 - echo -e "\nUsing files from USB device..." 1.12 - echo "XXX" 1.13 - rm /media/cdrom/boot 2>/dev/null 1.14 - ln -s /home/boot /media/cdrom/boot 1.15 - sleep 2 1.16 - fi 1.17 + # We may be in LiveUSB mode 1.18 + elif [ -d /home/boot ]; then 1.19 + echo "XXX" && echo 60 1.20 + echo -e "\nUsing files from USB device..." 1.21 + echo "XXX" 1.22 + rm /media/cdrom/boot 2>/dev/null 1.23 + ln -s /home/boot /media/cdrom/boot 1.24 + sleep 2 1.25 + # We may be in Tiny Web boot mode 1.26 + elif [ -d /cdrom/boot ]; then 1.27 + echo "XXX" && echo 60 1.28 + echo -e "\nUsing files from HTTP device..." 1.29 + echo "XXX" 1.30 + rm /media/cdrom/boot 2>/dev/null 1.31 + ln -s /cdrom/boot /media/cdrom/boot 1.32 + sleep 2 1.33 fi 1.34 1.35 echo "XXX" && echo 90