wok-current rev 24152

linux64: built in nfs support
author Pascal Bellard <pascal.bellard@slitaz.org>
date Mon Dec 06 10:55:21 2021 +0000 (2021-12-06)
parents 5604c90d7b2c
children dcf52a7882e6
files linld/stuff/src/CRTL.ASM linux/stuff/linux-slitaz.config64 syslinux/stuff/iso2exe/init
line diff
     1.1 --- a/linld/stuff/src/CRTL.ASM	Thu Dec 02 13:45:40 2021 +0100
     1.2 +++ b/linld/stuff/src/CRTL.ASM	Mon Dec 06 10:55:21 2021 +0000
     1.3 @@ -536,7 +536,11 @@
     1.4  		call	readfd ; // read x->fileofs & x->filesize
     1.5  		pop	bx
     1.6  		; x->fileofs = 0x7FF0 - (x->filesize &= 0xFFFF);
     1.7 -		mov	ax,7FF0h
     1.8 +		mov	ax,7FF0h		; old way : up to md5 signature
     1.9 +@@oldway:
    1.10 +		xor	ax,6FF0h		; new way : between Apple partitions = up to 1000h
    1.11 +		neg	word ptr [bx+4]		; fix x->filesize
    1.12 +		js	@@oldway
    1.13  		cwd
    1.14  		mov	[word bx+6],dx
    1.15  		sub	ax,[bx+4]
     2.1 --- a/linux/stuff/linux-slitaz.config64	Thu Dec 02 13:45:40 2021 +0100
     2.2 +++ b/linux/stuff/linux-slitaz.config64	Mon Dec 06 10:55:21 2021 +0000
     2.3 @@ -5039,15 +5039,15 @@
     2.4  CONFIG_EFIVAR_FS=m
     2.5  CONFIG_ORE=m
     2.6  CONFIG_NETWORK_FILESYSTEMS=y
     2.7 -CONFIG_NFS_FS=m
     2.8 -CONFIG_NFS_V2=m
     2.9 -CONFIG_NFS_V3=m
    2.10 +CONFIG_NFS_FS=y
    2.11 +CONFIG_NFS_V2=y
    2.12 +CONFIG_NFS_V3=y
    2.13  CONFIG_NFS_V3_ACL=y
    2.14 -CONFIG_NFS_V4=m
    2.15 +CONFIG_NFS_V4=y
    2.16  # CONFIG_NFS_SWAP is not set
    2.17  CONFIG_NFS_V4_1=y
    2.18  CONFIG_NFS_V4_2=y
    2.19 -CONFIG_PNFS_FILE_LAYOUT=m
    2.20 +CONFIG_PNFS_FILE_LAYOUT=y
    2.21  CONFIG_PNFS_BLOCK=m
    2.22  CONFIG_PNFS_OBJLAYOUT=m
    2.23  CONFIG_NFS_V4_1_IMPLEMENTATION_ID_DOMAIN="kernel.org"
    2.24 @@ -5060,12 +5060,12 @@
    2.25  CONFIG_NFSD_V3=y
    2.26  CONFIG_NFSD_V3_ACL=y
    2.27  CONFIG_NFSD_V4=y
    2.28 -CONFIG_LOCKD=m
    2.29 +CONFIG_LOCKD=y
    2.30  CONFIG_LOCKD_V4=y
    2.31 -CONFIG_NFS_ACL_SUPPORT=m
    2.32 +CONFIG_NFS_ACL_SUPPORT=y
    2.33  CONFIG_NFS_COMMON=y
    2.34 -CONFIG_SUNRPC=m
    2.35 -CONFIG_SUNRPC_GSS=m
    2.36 +CONFIG_SUNRPC=y
    2.37 +CONFIG_SUNRPC_GSS=y
    2.38  CONFIG_SUNRPC_BACKCHANNEL=y
    2.39  CONFIG_RPCSEC_GSS_KRB5=m
    2.40  # CONFIG_SUNRPC_DEBUG is not set
     3.1 --- a/syslinux/stuff/iso2exe/init	Thu Dec 02 13:45:40 2021 +0100
     3.2 +++ b/syslinux/stuff/iso2exe/init	Mon Dec 06 10:55:21 2021 +0000
     3.3 @@ -11,11 +11,11 @@
     3.4  {
     3.5  	mkdir -p $media
     3.6  	for bdev in /sys/block/*; do
     3.7 -		for dev in $(ls -d $bdev/$(basename $bdev)*); do
     3.8 +		for dev in $(ls -d $bdev/${bdev##*/}*); do
     3.9  			[ "$dev" ] || continue 2
    3.10 -			mount /dev/$(basename $dev) $mnt
    3.11 -			if [ -s $mnt/$ISO ] && [ $(getarg magic) = $(hexdump -v -s  18 -n 2 -e "\"\" 1/2 \" %u\n\"" $mnt/$ISO) ]; then
    3.12 -				echo "Found $ISO on $(basename $dev)"
    3.13 +			mount /dev/${dev##*/} $mnt
    3.14 +			if [ -s $mnt/$ISO ] && [ $(getarg magic) = $(hexdump -vs18 -n2 -e "\"\" 1/2 \" %u\n\"" $mnt/$ISO) ]; then
    3.15 +				echo "Found $ISO on ${dev##*/}"
    3.16  				ISO=$mnt/$ISO
    3.17  				mount -o loop,ro $ISO $media
    3.18  				return
    3.19 @@ -30,15 +30,15 @@
    3.20  uncpio64()
    3.21  {
    3.22  	i=$1
    3.23 -	grep ' lm ' /proc/cpuinfo && [ -s ${i}64 ] && i=${i}64
    3.24 +	grep -q ' lm ' /proc/cpuinfo && [ -s ${i}64 ] && i=${i}64
    3.25  	[ -s "$i" ] || return
    3.26 -	echo -en "\n Extracting $(basename $i) ..."
    3.27 +	echo -en "\n Extracting ${i##*/} ..."
    3.28  	case $(get 0 $i) in
    3.29  	*35615)	( zcat || gunzip );;
    3.30  	*14333) unxz;;
    3.31  	*\ 93)	unlzma;;
    3.32  	*)	cat;;
    3.33 -	esac < $i | ( cd ${2:-/}; cpio -idmu > /dev/null 2>&1 )
    3.34 +	esac < $i | ( cd ${2:-/}; cpio -idmu >/dev/null 2>&1 )
    3.35  }
    3.36  
    3.37  tty0=tty0
    3.38 @@ -77,8 +77,8 @@
    3.39  	[ -d /etc/skel ] || $uncpio $(ls -r $media/boot/rootfs?*.* | sed q)
    3.40  	init=
    3.41  	cmdline="$(cat /proc/cmdline)"
    3.42 -	if $xhascustomconf 2> /dev/null; then
    3.43 -		getcustomconf /tmp > /dev/null
    3.44 +	if $xhascustomconf 2>/dev/null; then
    3.45 +		getcustomconf /tmp >/dev/null
    3.46  		[ -s /tmp/cmdline ] &&
    3.47  			cmdline="$cmdline $(cat /tmp/cmdline)" &&
    3.48  			init="$(sed '/rdinit=/!d;s/.*rdinit=\([^ ]*\).*/\1/' /tmp/cmdline)"
    3.49 @@ -131,7 +131,7 @@
    3.50  mount -t proc /proc /proc
    3.51  mount -t sysfs /sys /sys
    3.52  udevd --daemon 2>/dev/null && udevadm trigger && sleep 5
    3.53 -mdev -s 2> /dev/null ||
    3.54 +mdev -s 2>/dev/null ||
    3.55  for i in /sys/block/*/dev /sys/block/*/*/dev; do
    3.56  	[ -s "$i" ] || continue
    3.57  	n=${i%/dev}
    3.58 @@ -142,7 +142,7 @@
    3.59  ISO="$(getarg iso | sed 's/.://;s|\\|/|g')"
    3.60  getiso 2>/dev/null || text
    3.61  if [ -s /lib/modules/squashfs.ko* ]; then
    3.62 -	insmod /lib/modules/squashfs.ko* 2>/dev/null
    3.63 +	insmod /lib/modules/squashfs.ko*
    3.64  	if [ -d $media/fs ]; then
    3.65  		ln -s $media/fs /sqfs
    3.66  	else
    3.67 @@ -152,9 +152,9 @@
    3.68  	fi
    3.69  	cp -a /sqfs/dev/fuse /sqfs/dev/tty[12] /dev
    3.70  	for i in /sqfs/dev/* ; do [ -b $i ] && cp -a $i /dev ; done
    3.71 -	ln -s /sqfs/lib/* lib 2>/dev/null
    3.72 +	ln -s /sqfs/lib/* lib
    3.73  	ln -fs /sqfs/usr /sqfs/var /
    3.74 -	mkdir /etc && cp /sqfs/etc/dialogrc /etc 2>/dev/null
    3.75 -fi
    3.76 +	mkdir /etc && cp /sqfs/etc/dialogrc /etc
    3.77 +fi 2>/dev/null
    3.78  [ -s /usr/bin/taziso ] || live
    3.79  . /usr/bin/taziso