wok diff syslinux/stuff/iso2exe/init @ rev 23962

Add caprice32 (again)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Thu Oct 01 16:36:55 2020 +0000 (3 weeks ago)
parents c2a80ff9499e
children
line diff
     1.1 --- a/syslinux/stuff/iso2exe/init	Sun May 31 14:59:28 2020 +0000
     1.2 +++ b/syslinux/stuff/iso2exe/init	Thu Oct 01 16:36:55 2020 +0000
     1.3 @@ -35,7 +35,9 @@
     1.4  getiso()
     1.5  {
     1.6  	mkdir -p $media
     1.7 -	for dev in /sys/block/?d?/?d??*; do
     1.8 +	for dev in /sys/block/*; do
     1.9 +		dev=$(ls $dev/$(basename $dev)* 2> /dev/null)
    1.10 +		[ "$dev" ] || continue
    1.11  		mount /dev/$(basename $dev) $mnt
    1.12  		if checkmagic $mnt/$ISO; then
    1.13  			mount -o loop,ro $mnt/$ISO $media
    1.14 @@ -52,7 +54,7 @@
    1.15  uncpio64()
    1.16  {
    1.17  	i=$1
    1.18 -	sed 's|$| |' /proc/cpuinfo | grep ' lm ' && [ -s ${i}64 ] && i=${i}64
    1.19 +	grep ' lm ' /proc/cpuinfo && [ -s ${i}64 ] && i=${i}64
    1.20  	[ -s "$i" ] || return
    1.21  	echo -en "\n Extracting $(basename $i) ..."
    1.22  	case $(get 0 $i) in
    1.23 @@ -93,7 +95,8 @@
    1.24  		losetup -o 124 /dev/loop6 $(ls -r $media/boot/rootfs?*.* | sed q)
    1.25  		mount -r /dev/loop6 /sqfs
    1.26  	fi
    1.27 -	cp -a /sqfs/dev/fuse /sqfs/dev/tty[12] /sqfs/dev/[hs]d* /dev
    1.28 +	cp -a /sqfs/dev/fuse /sqfs/dev/tty[12] /dev
    1.29 +	for i in /sqfs/dev/* ; do [ -b $i ] && cp -a $i /dev ; done
    1.30  	ln -s /sqfs/lib/* lib 2>/dev/null
    1.31  	ln -fs /sqfs/usr /sqfs/var /
    1.32  	mkdir /etc && cp /sqfs/etc/dialogrc /etc 2>/dev/null
    1.33 @@ -167,16 +170,6 @@
    1.34  	kexec -e
    1.35  }
    1.36  
    1.37 -runmemtest()
    1.38 -{
    1.39 -	gotcdfile "memtest*" && dokexec
    1.40 -}
    1.41 -
    1.42 -runpxe()
    1.43 -{
    1.44 -	gotcdfile "?pxe*" && dokexec
    1.45 -}
    1.46 -
    1.47  shell()
    1.48  {
    1.49  	trap text 2
    1.50 @@ -187,6 +180,7 @@
    1.51  [ -x /usr/s$BIN ] || mv /bin/mount.posixovl.iso2exe \
    1.52  /usr/s$BIN 2>/dev/null || mv /bin/mount.posixovl.iso2exe /$BIN 2>/dev/null
    1.53  mount_proc
    1.54 +mdev -s 2> /dev/null ||
    1.55  for i in /sys/block/*/dev /sys/block/*/*/dev; do
    1.56  	[ -s "$i" ] || continue
    1.57  	n=${i%/dev}