wok-next diff syslinux/stuff/iso2exe/init @ rev 14317
elementary-dev: update deps
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Apr 07 13:15:40 2013 +0200 (2013-04-07) |
parents | d965b76fefd1 |
children | 72556e4745dd |
line diff
1.1 --- a/syslinux/stuff/iso2exe/init Fri Apr 05 13:11:51 2013 +0200 1.2 +++ b/syslinux/stuff/iso2exe/init Sun Apr 07 13:15:40 2013 +0200 1.3 @@ -128,7 +128,7 @@ 1.4 fi > /mnt/slitaz/boot/rootfs.gz 1.5 mkdir /mnt/slitaz/home 1.6 initrd=rootfs.gz 1.7 - extraargs="/home=$(getuuid)/slitaz/home" # FIXME /dos 1.8 + extraargs="/home=$(getuuid)/slitaz/home" # FIXME /mnt/dos 1.9 else 1.10 if [ -d /media/cdrom/fs ]; then 1.11 cp -a /media/cdrom/fs/. /mnt/slitaz 1.12 @@ -196,6 +196,7 @@ 1.13 " 19 70 1.14 [ $? -eq 0 ] || return 1.15 doinstall 1.16 + [ -x /sbin/init ] || return 1.17 umount -d /media/cdrom 1.18 umount /proc 1.19 exec chroot /mnt/slitaz /sbin/init 1.20 @@ -225,10 +226,10 @@ 1.21 ( zcat $i 2> /dev/null || unlzma -c $i ) | cpio -idmu 1.22 done 1.23 fi 1.24 + [ -x /sbin/init ] || return 1.25 umount -d /media/cdrom 1.26 - mkdir /dos 1.27 - mount --move /mnt /dos 1.28 - ln -s /dos/slitaz/home /home 1.29 + mount --move /mnt /mnt/dos 1.30 + ln -s /mnt/dos/slitaz/home /home 1.31 umount /proc 1.32 exec /sbin/init 1.33 }