wok-current 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 1aa68395bb51
children f4b38c321469
files cryptsetup-dev/receipt dmsetup/receipt libdevmapper-dev/receipt libdevmapper/receipt syslinux/stuff/iso2exe/taziso
line diff
     1.1 --- a/cryptsetup-dev/receipt	Sun Mar 15 10:14:44 2020 +0100
     1.2 +++ b/cryptsetup-dev/receipt	Sun Mar 15 15:33:30 2020 +0100
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="cryptsetup-dev"
     1.7 -VERSION="2.3.0"
     1.8 +VERSION="2.3.1"
     1.9  CATEGORY="development"
    1.10  SHORT_DESC="cryptsetup library - development files."
    1.11  MAINTAINER="b1+slitaz@nagel.org"
     2.1 --- a/dmsetup/receipt	Sun Mar 15 10:14:44 2020 +0100
     2.2 +++ b/dmsetup/receipt	Sun Mar 15 15:33:30 2020 +0100
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="dmsetup"
     2.7 -VERSION="2.02.183"
     2.8 +VERSION="2.03.08"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="Linux device mapper setup tool."
    2.11  MAINTAINER="b1+slitaz@nagel.org"
     3.1 --- a/libdevmapper-dev/receipt	Sun Mar 15 10:14:44 2020 +0100
     3.2 +++ b/libdevmapper-dev/receipt	Sun Mar 15 15:33:30 2020 +0100
     3.3 @@ -1,7 +1,7 @@
     3.4  # SliTaz package receipt.
     3.5  
     3.6  PACKAGE="libdevmapper-dev"
     3.7 -VERSION="2.02.183"
     3.8 +VERSION="2.03.08"
     3.9  CATEGORY="development"
    3.10  SHORT_DESC="Linux device mapper library development files."
    3.11  MAINTAINER="b1+slitaz@nagel.org"
     4.1 --- a/libdevmapper/receipt	Sun Mar 15 10:14:44 2020 +0100
     4.2 +++ b/libdevmapper/receipt	Sun Mar 15 15:33:30 2020 +0100
     4.3 @@ -1,7 +1,7 @@
     4.4  # SliTaz package receipt.
     4.5  
     4.6  PACKAGE="libdevmapper"
     4.7 -VERSION="2.02.183"
     4.8 +VERSION="2.03.08"
     4.9  CATEGORY="system-tools"
    4.10  SHORT_DESC="Linux device mapper library."
    4.11  MAINTAINER="b1+slitaz@nagel.org"
     5.1 --- a/syslinux/stuff/iso2exe/taziso	Sun Mar 15 10:14:44 2020 +0100
     5.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun Mar 15 15:33:30 2020 +0100
     5.3 @@ -135,7 +135,8 @@
     5.4  			/dev/console ; do
     5.5  		cp -a $2$i $fs/dev/
     5.6  	done
     5.7 -	for i in /bin/busybox $(which mount.posixovl) $(which blkid); do
     5.8 +	for i in /bin/busybox $(which mount.posixovl) $(which blkid) \
     5.9 +		 $(which ntfs-3g); do
    5.10  		cp $(LD_TRACE_LOADED_OBJECTS=1 /lib/ld*.so $i | \
    5.11  		sed 's|.*=> \(.*/lib/l[^ ]*\).*|\1|;/^\//!d') $fs/lib
    5.12  		cp $i $fs/bin
    5.13 @@ -164,7 +165,8 @@
    5.14    arg debug "shell" && debug=true && set -x
    5.15  for i in /lib/*.ko* ; do insmod \$i 2> /dev/null ; done; sleep 2
    5.16  arg mount "Mount device"
    5.17 -mount \$( (blkid /dev/[sh]d* || blkid) | grep \$val | sed 's/:.*//;q') /mnt
    5.18 +dsk=\$( (blkid /dev/[sh]d* || blkid) | grep \$val | sed 's/:.*//;q')
    5.19 +mount \$dsk /mnt || mount.ntfs \$dsk /mnt
    5.20  arg subroot "Change root to directory"
    5.21  if [ -d /mnt/\$val ]; then
    5.22  	umount /mnt 2> /dev/null
    5.23 @@ -178,7 +180,8 @@
    5.24  		umount /mnt
    5.25  	done
    5.26  fi
    5.27 -$([ "$3" ] || echo '# ')mount.posixovl -F /mnt/\$val -- -oallow_other -odefault_permissions -osuid
    5.28 +
    5.29 +$([ "$3" ] || echo -n '# ')mount.posixovl -F /mnt/\$val -- -oallow_other -odefault_permissions -osuid
    5.30  mount --bind /mnt /mnt/\$val/mnt/dos
    5.31  mount -o size=0,ro -t tmpfs tmpfs /mnt/\$val/mnt/dos/\$val
    5.32  LDSO=\$(ls /mnt/\$val/lib/ld-* | sed q)