wok diff syslinux/stuff/iso2exe/taziso @ rev 23149

syslinux/taziso: ntfs support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Mar 15 15:33:30 2020 +0100 (2020-03-15)
parents e93e6b4d565f
children d33c3c211ef8
line diff
     1.1 --- a/syslinux/stuff/iso2exe/taziso	Sun Aug 25 18:00:45 2019 +0200
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun Mar 15 15:33:30 2020 +0100
     1.3 @@ -135,7 +135,8 @@
     1.4  			/dev/console ; do
     1.5  		cp -a $2$i $fs/dev/
     1.6  	done
     1.7 -	for i in /bin/busybox $(which mount.posixovl) $(which blkid); do
     1.8 +	for i in /bin/busybox $(which mount.posixovl) $(which blkid) \
     1.9 +		 $(which ntfs-3g); do
    1.10  		cp $(LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so $i | \
    1.11  		sed 's|.*=> \(.*/lib/l[^ ]*\).*|\1|;/^\//!d') $fs/lib
    1.12  		cp $i $fs/bin
    1.13 @@ -164,7 +165,8 @@
    1.14    arg debug "shell" && debug=true && set -x
    1.15  for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
    1.16  arg mount "Mount device"
    1.17 -mount \$( (blkid /dev/[sh]d* || blkid) | grep \$val | sed 's/:.*//;q') /mnt
    1.18 +dsk=\$( (blkid /dev/[sh]d* || blkid) | grep \$val | sed 's/:.*//;q')
    1.19 +mount \$dsk /mnt || mount.ntfs \$dsk /mnt
    1.20  arg subroot "Change root to directory"
    1.21  if [ -d /mnt/\$val ]; then
    1.22  	umount /mnt 2> /dev/null
    1.23 @@ -178,7 +180,8 @@
    1.24  		umount /mnt
    1.25  	done
    1.26  fi
    1.27 -$([ "$3" ] || echo '# ')mount.posixovl -F /mnt/\$val -- -oallow_other -odefault_permissions -osuid
    1.28 +
    1.29 +$([ "$3" ] || echo -n '# ')mount.posixovl -F /mnt/\$val -- -oallow_other -odefault_permissions -osuid
    1.30  mount --bind /mnt /mnt/\$val/mnt/dos
    1.31  mount -o size=0,ro -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val
    1.32  LDSO=\$(ls /mnt/\$val/lib/ld-* | sed q)