slitaz-boot-scripts rev 332

init/posixovl: assume vfat (worst case)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Wed Mar 13 16:58:26 2013 +0100 (2013-03-13)
parents 6985bc31569e
children 514c674eb843
files COPYING etc/init.d/bootopts.sh init
line diff
     1.1 --- a/COPYING	Sat Feb 16 19:53:53 2013 +0100
     1.2 +++ b/COPYING	Wed Mar 13 16:58:26 2013 +0100
     1.3 @@ -2,7 +2,7 @@
     1.4  ===============================================================================
     1.5  
     1.6  
     1.7 -Copyright (c)  2007-2010  SliTaz GNU/Linux
     1.8 +Copyright (c)  2007-2013  SliTaz GNU/Linux
     1.9  
    1.10  
    1.11  Français
     2.1 --- a/etc/init.d/bootopts.sh	Sat Feb 16 19:53:53 2013 +0100
     2.2 +++ b/etc/init.d/bootopts.sh	Wed Mar 13 16:58:26 2013 +0100
     2.3 @@ -64,7 +64,7 @@
     2.4  				mount /dev/$DEVID /home -o uid=1000,gid=100 2>/dev/null \
     2.5  					|| mount /dev/$DEVID /home
     2.6  				case "$(/sbin/blkid | grep /dev/$DEVID:)" in
     2.7 -				*\"ntfs\"*|*\"vfat\"*) mount.posixovl /home ;;
     2.8 +				*\"ntfs\"*|*\"vfat\"*) mount.posixovl -F /home ;;
     2.9  				esac
    2.10  				# Check if swap file must be generated in /home: swap=size (Mb).
    2.11  				# This option is only used within home=device.
     3.1 --- a/init	Sat Feb 16 19:53:53 2013 +0100
     3.2 +++ b/init	Wed Mar 13 16:58:26 2013 +0100
     3.3 @@ -145,7 +145,7 @@
     3.4  	[ "$dev" = "$root" ] || dev="$root ($dev)"
     3.5  	echo "Mount $dev..."
     3.6  	mnt /mnt
     3.7 -	arg posixovl && echo "And posixovl..." && mount.posixovl /mnt
     3.8 +	arg posixovl && echo "And posixovl..." && mount.posixovl -F /mnt
     3.9  fi
    3.10  got loopfs && echo "Into file $root..." &&
    3.11  	losetup /dev/loop0 /mnt/$root && mount /dev/loop0 /mnt
    3.12 @@ -189,7 +189,7 @@
    3.13  p=
    3.14  c=/mnt/.cdrom
    3.15  if [ -z "$(ls /mnt/rootfs* 2>/dev/null)" ]
    3.16 -then	root=cdrom/fs
    3.17 +then	root=/dev/cdrom/fs
    3.18  	got rodev
    3.19  	mkdir -p $c /mnt$c /mnt/.rw$c
    3.20  	mnt $c