wok rev 20773

updated cd-discid (1.1 -> 1.4)
author Hans-G?nter Theisgen
date Wed Feb 13 17:00:50 2019 +0100 (21 months ago)
parents c552db5929eb 02994416f017
children 3a1a00c50d15
files
line diff
     1.1 --- a/cpige/receipt	Wed Feb 13 16:59:39 2019 +0100
     1.2 +++ b/cpige/receipt	Wed Feb 13 17:00:50 2019 +0100
     1.3 @@ -38,9 +38,9 @@
     1.4  	cp -a $src/cpige $fs/usr/bin
     1.5  	cp -a $src/gui/cpigeGUI $fs/usr/bin
     1.6  
     1.7 -	mkdir -p $fs/usr/share/doc/cpige
     1.8 +	mkdir -p $fs/usr/share/doc/cpige $install/usr/share/man
     1.9  	cp -a $src/cpige.conf.example $fs/usr/share/doc/cpige
    1.10 -#	cp -a $src/cpige.1.gz $fs/usr/share/doc/cpige
    1.11 +	cp -a $src/cpige.1.gz $install/usr/share/man
    1.12  
    1.13  	# Because there is no label msgfmt in Makefile:
    1.14  	mkdir -p $fs/usr/share/locale/fr/LC_MESSAGES
     2.1 --- a/syslinux/stuff/iso2exe/README	Wed Feb 13 16:59:39 2019 +0100
     2.2 +++ b/syslinux/stuff/iso2exe/README	Wed Feb 13 17:00:50 2019 +0100
     2.3 @@ -44,11 +44,11 @@
     2.4  
     2.5  ISO9660 format begins with 32Kb unused (16 sectors). Some programs may use it:
     2.6  
     2.7 -- isolinux uses the first 512 bytes for hybrid iso boot (ISO image in a 
     2.8 +- isolinux uses the first 512 bytes for hybrid iso boot (ISO image in a
     2.9    partition).
    2.10  - tazlito stores extra flavor info at the 2nd Kb for 'tazlito iso2flavor'.
    2.11  
    2.12 -The iso2exe tool moves the isolinux boot sector, installs its own boot sector 
    2.13 +The iso2exe tool moves the isolinux boot sector, installs its own boot sector
    2.14  with a DOS .EXE header, and adds a WIN32 .EXE installer, a DOS .COM Linux
    2.15  loader, a floppy bootstrap and an initramfs in the end of the first 32Kb.
    2.16  
    2.17 @@ -73,7 +73,7 @@
    2.18      +-----------------+
    2.19      |  iso2exe boot + | Boot starts isohybrid (2), .EXE starts DOS .COM loader
    2.20      |  WIN32 PE .exe  | NT+ boot device creator / Win9x DOS .COM launcher.
    2.21 -  0 +-----------------+ 
    2.22 +  0 +-----------------+
    2.23  
    2.24  (1) The following script will show computed and stored md5 hash
    2.25  #!/bin/sh
     3.1 --- a/syslinux/stuff/iso2exe/init	Wed Feb 13 16:59:39 2019 +0100
     3.2 +++ b/syslinux/stuff/iso2exe/init	Wed Feb 13 17:00:50 2019 +0100
     3.3 @@ -70,7 +70,7 @@
     3.4  		--menu|--radiolist)
     3.5  			[ "$1" == "--menu" ] && shft=2 || shft=3
     3.6  			label=""
     3.7 -			[ "$2" ] && label="\n$2" 
     3.8 +			[ "$2" ] && label="\n$2"
     3.9  			shift 5
    3.10  			echo -e "$title$label\n0	Cancel" > /tmp/data
    3.11  			n=1
    3.12 @@ -372,19 +372,17 @@
    3.13  
    3.14  install()
    3.15  {
    3.16 -	$DIALOG --clear \
    3.17 -		--title " SliTaz UMSDOS way installation " \
    3.18 +	$DIALOG --clear --title " SliTaz UMSDOS way installation " \
    3.19  		--yes-label "Install" --yesno \
    3.20  "\nSliTaz will be installed in the subdirectory \\slitaz of the current
    3.21  DOS/Windows partition. You will see your files from /mnt/dos.\n\n
    3.22  You can start SliTaz with \\slitaz\\boot\\tazboot.exe\n\n
    3.23  To uninstall SliTaz, you have only to remove this directory.
    3.24  The file \\boot.ini or \\config.sys may be modified too.\n\n
    3.25 -SliTaz may run slowly on the 'UMSDOS way' installation due to the 
    3.26 +SliTaz may run slowly on the 'UMSDOS way' installation due to the
    3.27  posixovl filesystem. The 'TAZUSB way' installation runs faster.\n\n
    3.28  To do a traditional installation with disk partitioning,
    3.29 -start SliTaz Live with the 'SliTaz RAM boot' menu.\n
    3.30 -" 19 70
    3.31 +start SliTaz Live with the 'SliTaz RAM boot' menu.\n" 19 70
    3.32  	[ $? -eq 0 ] || return
    3.33  	doinstall || return
    3.34  	[ -x /mnt/slitaz/sbin/init ] || return
    3.35 @@ -395,8 +393,7 @@
    3.36  
    3.37  installtaz()
    3.38  {
    3.39 -	$DIALOG --clear \
    3.40 -		--title " SliTaz TAZUSB way installation " \
    3.41 +	$DIALOG --clear --title " SliTaz TAZUSB way installation " \
    3.42  		--yes-label "Install" --yesno \
    3.43  "\nSliTaz will be installed in the subdirectory \\slitaz of the current
    3.44  DOS/Windows partition. You will see your files from /mnt/dos.\n\n
    3.45 @@ -406,11 +403,10 @@
    3.46  The filesystem is loaded entirely into memory upon boot to
    3.47  increase responsiveness. Only /home lands on the hard disk.\n\n
    3.48  To do a traditional installation with disk partitioning,
    3.49 -start SliTaz Live with the 'SliTaz RAM boot' menu.\n
    3.50 -" 19 70
    3.51 +start SliTaz Live with the 'SliTaz RAM boot' menu.\n" 19 70
    3.52  	[ $? -eq 0 ] || return
    3.53  	doinstall tazusblike || return
    3.54 -	dotwait 
    3.55 +	dotwait
    3.56  	if [ -d /media/cdrom/fs ]; then
    3.57  		cp -a /media/cdrom/fs/. /
    3.58  	else
    3.59 @@ -433,13 +429,12 @@
    3.60  
    3.61  tazboot()
    3.62  {
    3.63 -	$DIALOG --clear \
    3.64 -		--title " SliTaz bootloader for DOS " \
    3.65 +	$DIALOG --clear --title " SliTaz bootloader for DOS " \
    3.66  		--yes-label "Install" --yesno \
    3.67  "\nThe file TAZBOOT.EXE will be created in the top directory. It supports
    3.68  any linux kernel, multiple initramfs, a kernel command line and
    3.69  an ISO image file loopback (retrieves files from an ISO file).\n\n
    3.70 -Usage: tazboot.exe [[@commands]|[kernel=<bzimage>] 
    3.71 +Usage: tazboot.exe [[@commands]|[kernel=<bzimage>]
    3.72  [initrd=<rootfs>[,<rootfs2>...]] [bootfrom=<isofile>] cmdline args ...]\n\n
    3.73  Defaults: tazboot @tazboot.cmd or tazboot kernel=bzImage auto\n\n\
    3.74  Examples for tazboot.cmd:\n\n\
    3.75 @@ -448,8 +443,7 @@
    3.76    initrd=boot/rootfs4.gz,boot/rootfs3.gz,boot/rootfs2.gz,boot/rootfs1.gz\n\
    3.77    rw root=/dev/null autologin\n\n\
    3.78    kernel=\\slitaz\\vmlinuz root=/dev/sda5 ro\n\n
    3.79 -Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n
    3.80 -" 24 78
    3.81 +Unlike GRUB4DOS, it doesn't require unfragmented ISO image files.\n" 24 78
    3.82  	[ $? -eq 0 ] || return
    3.83  	gettazboot /mnt/tazboot.exe
    3.84  }
    3.85 @@ -459,9 +453,7 @@
    3.86  	dotwait "Checking files"
    3.87  	( cd /media/cdrom ; ${1:-md5sum -c md5sum*} | sort ) > /tmp/data
    3.88  	rm -f /tmp/wait
    3.89 -	$DIALOG --clear \
    3.90 -		--title " Checked files " \
    3.91 -		--textbox /tmp/data 24 78
    3.92 +	$DIALOG --clear --title " Checked files " --textbox /tmp/data 24 78
    3.93  	rm -f /tmp/data
    3.94  }
    3.95  
    3.96 @@ -484,22 +476,18 @@
    3.97  readme()
    3.98  {
    3.99  	gotcdfile "README*"
   3.100 -	$DIALOG --clear \
   3.101 -		--title " Readme " \
   3.102 -		--textbox $file 24 78
   3.103 +	$DIALOG --clear --title " Readme " --textbox $file 24 78
   3.104  }
   3.105  
   3.106  bootlog()
   3.107  {
   3.108 -	$DIALOG --clear \
   3.109 -		--title " Linux boot messages " \
   3.110 +	$DIALOG --clear --title " Linux boot messages " \
   3.111  		--textbox /tmp/dmesg 24 78
   3.112  }
   3.113  
   3.114  bzimage()
   3.115  {
   3.116 -	$DIALOG --clear \
   3.117 -		--title " Create linux.exe ? " \
   3.118 +	$DIALOG --clear --title " Create linux.exe ? " \
   3.119  		--yes-label "Install" --yesno \
   3.120  "\nLinux.exe launches the linux kernel under DOS (in real mode only).
   3.121  The cmdline arguments are supported except initrd=,
   3.122 @@ -512,13 +500,11 @@
   3.123  
   3.124  memtest()
   3.125  {
   3.126 -	$DIALOG --clear \
   3.127 -		--title " Create memtest.exe ? " \
   3.128 +	$DIALOG --clear --title " Create memtest.exe ? " \
   3.129  		--yes-label "Install" --yesno \
   3.130  "\nMemtest86 is a thorough, stand alone memory test for x86 architecture
   3.131  computers. BIOS based memory tests are a quick, cursory check and often
   3.132 -miss many of the failures that are detected by Memtest86.\n
   3.133 -" 12 70
   3.134 +miss many of the failures that are detected by Memtest86.\n" 12 70
   3.135  	[ $? -eq 0 ] && gotcdfile "memtest*" && cp $file /mnt/memtest.exe
   3.136  }
   3.137  
   3.138 @@ -556,49 +542,43 @@
   3.139  
   3.140  fdmemtest()
   3.141  {
   3.142 -	$DIALOG --clear \
   3.143 -		--title " Create a Memtest86 boot floppy " \
   3.144 +	$DIALOG --clear --title " Create a Memtest86 boot floppy " \
   3.145  		--yes-label "Create floppy" --yesno \
   3.146  "\nMemtest86 is a thorough, stand alone memory test for x86 architecture
   3.147  computers. BIOS based memory tests are a quick, cursory check and often
   3.148  miss many of the failures that are detected by Memtest86.\n\n
   3.149 -Please insert a blank disk in floppy drive.\n
   3.150 -" 12 70
   3.151 +Please insert a blank disk in floppy drive.\n" 12 70
   3.152  	[ $? -eq 0 ] && gotcdfile "memtest*" && mkfloppy $file
   3.153  }
   3.154  
   3.155  pxe()
   3.156  {
   3.157  	gotcdfile "?pxe*"
   3.158 -	$DIALOG --clear \
   3.159 -		--title " Create $(basename $file).exe ? " \
   3.160 +	$DIALOG --clear --title " Create $(basename $file).exe ? " \
   3.161  		--yes-label "Install" --yesno \
   3.162  "\nBoot your operating system from the internet and enjoy a full system
   3.163  working entirely in RAM with speed and stability in mind. The Linux Kernel
   3.164  and the complete SliTaz compressed root filesystem will be loaded into RAM
   3.165 -from the Web using PXE and HTTP protocols.\n
   3.166 -" 12 70
   3.167 +from the Web using PXE and HTTP protocols.\n" 12 70
   3.168  	[ $? -eq 0 ] || return
   3.169  	cp $file /mnt/$(basename $file).exe
   3.170  }
   3.171  
   3.172  fdpxe()
   3.173  {
   3.174 -	$DIALOG --clear \
   3.175 -		--title " Create a SliTaz Web boot floppy " \
   3.176 +	$DIALOG --clear --title " Create a SliTaz Web boot floppy " \
   3.177  		--yes-label "Create floppy" --yesno \
   3.178  "\nBoot your operating system from the internet and enjoy a full system
   3.179  working entirely in RAM with speed and stability in mind. The Linux Kernel
   3.180  and the complete SliTaz compressed root filesystem will be loaded into RAM
   3.181  from the Web using PXE and HTTP protocols.\n\n
   3.182 -Please insert a blank disk in floppy drive.\n
   3.183 -" 12 70
   3.184 +Please insert a blank disk in floppy drive.\n" 12 70
   3.185  	[ $? -eq 0 ] && gotcdfile "?pxe*" && mkfloppy $file
   3.186  }
   3.187  
   3.188  gotposixovl()
   3.189  {
   3.190 -	mount.posixovl 2>&1 | grep -qi usage && 
   3.191 +	mount.posixovl 2>&1 | grep -qi usage &&
   3.192  	echo -en "\"$1\"	\"$2\""
   3.193  }
   3.194  
   3.195 @@ -640,7 +620,7 @@
   3.196  
   3.197  fddata()
   3.198  {
   3.199 -	[ -e /sys/block/fd0 ] && 
   3.200 +	[ -e /sys/block/fd0 ] &&
   3.201  	[ $(get 26 /mnt/$ISO 1 2> /dev/null || echo 0) -ne 0 ] &&
   3.202  	echo -en "\"$1\"	\"$2\""
   3.203  }
   3.204 @@ -707,7 +687,7 @@
   3.205  			    ddq bs=1 count=$(($cnt % 512)); } > initrd &&
   3.206  			  ls -l initrd
   3.207  			  break ;;
   3.208 -		*)	  break ;;	  
   3.209 +		*)	  break ;;
   3.210  		esac
   3.211  	done
   3.212  	cd - > /dev/null
   3.213 @@ -747,7 +727,7 @@
   3.214  				  ddq bs=512 count=$((cnt / 512))
   3.215  				  ddq bs=1 count=$((cnt % 512))
   3.216  				  break ;;
   3.217 -			*)	  break ;;	  
   3.218 +			*)	  break ;;
   3.219  			esac
   3.220  		done | md5sum | cut -c1-32)"
   3.221  		[ "$md5" == "$(cat $TMP)" ] && echo "OK" || echo "ERROR"
   3.222 @@ -761,6 +741,7 @@
   3.223  if [ "$1" == "--build" ]; then	#install-begin
   3.224  	cp $0 $0.tmp
   3.225  	uuencode -m - < ifmem.bin | sed -e 's|^[ \t]*||;s|[ \t]*###.*||' \
   3.226 +	  -e 's| *;;|;;|;s|\t\t*|\t|g' \
   3.227  	  -e '/^ifmemcode$/r/dev/stdin' -e '/^ifmemcode$/d' -i $0.tmp
   3.228  	uuencode -m - < bootloader.bin | sed -e '/^bootloader$/r/dev/stdin' \
   3.229  	  -e '/^bootloader$/d' -e '/install-begin$/,/install-end$/d' -i $0.tmp
   3.230 @@ -831,7 +812,7 @@
   3.231  		 $(dirname $file)/$(locase $KERNEL); do
   3.232  		[ -s $i ] && KERNEL=$i && break
   3.233  	done
   3.234 -	rm -f /tmp/var$$ 
   3.235 +	rm -f /tmp/var$$
   3.236  	[ $(get 514 $KERNEL 4) -eq 1400005704 ] || return
   3.237  	n=$(($(get 497 $KERNEL 1)+1))
   3.238  	ddq bs=512 count=$n if=$KERNEL of=/tmp/fd$$
   3.239 @@ -919,13 +900,11 @@
   3.240  fdbootstrap()
   3.241  {
   3.242  	sz=$((512 * $(echo $(get 26 /mnt/$ISO 1))))
   3.243 -	$DIALOG --clear \
   3.244 -		--title " Create a floppy bootstrap " \
   3.245 +	$DIALOG --clear --title " Create a floppy bootstrap " \
   3.246  		--yes-label "Continue" --yesno \
   3.247  "\nThe floppy will install a driver to access the ISO file
   3.248 -on your hard disk and will emulate a CD-ROM during the boot process.\n\n 
   3.249 -Please insert a floppy in drive now.\n 
   3.250 -" 10 70
   3.251 +on your hard disk and will emulate a CD-ROM during the boot process.\n\n
   3.252 +Please insert a floppy in drive now.\n" 10 70
   3.253  	[ $? -eq 0 ] || return
   3.254  	ddq if=/mnt/$ISO of=/tmp/bootiso bs=1 count=512 \
   3.255  		skip=$(( $(get 64 /mnt/$ISO) - $sz ))
   3.256 @@ -946,8 +925,7 @@
   3.257  	grep -qs 1 /sys/block/$DEV/ro && return
   3.258  	[ "$DEV" ] || return
   3.259  	cat > /tmp/dialog <<EOT
   3.260 -$DIALOG  --clear \
   3.261 -	--title " Select your USB key " \
   3.262 +$DIALOG  --clear --title " Select your USB key " \
   3.263  	--menu "\nPlease select the USB key according to its known size.\n\n" \
   3.264  	14 70 4 \
   3.265  	$(for i in $DEV ; do
   3.266 @@ -970,21 +948,19 @@
   3.267  
   3.268  usbbootkey()
   3.269  {
   3.270 -	$DIALOG --clear \
   3.271 -		--title " Create a USB boot key " \
   3.272 +	$DIALOG --clear --title " Create a USB boot key " \
   3.273  		--yes-label "Continue" --yesno \
   3.274  "\nThe USB key will be used like a CD-ROM. You will not be able to write
   3.275  any data on the boot partition.\n\n
   3.276  An extra FAT32 partition will be created with the remaining free space.\n\n
   3.277 -$(tazusbmsg)Please plug your USB stick in now.\n 
   3.278 -" 16 70
   3.279 +$(tazusbmsg)Please plug your USB stick in now.\n" 16 70
   3.280  	[ $? -eq 0 ] || return
   3.281  	usbdev || return
   3.282  	
   3.283  	### perform dd in progress bar
   3.284  	max=$(($(cat /sys/block/loop0/size)/2048))
   3.285 -	i=0; ddq if=/mnt/$ISO bs=1024k | ( 
   3.286 -	while ddq bs=1024k count=1 ; do 
   3.287 +	i=0; ddq if=/mnt/$ISO bs=1024k | (
   3.288 +	while ddq bs=1024k count=1 ; do
   3.289  		i=$(($i + 1))
   3.290  		[ $i -gt $max ] && break
   3.291  		echo $((($i*100)/$max)) | dialog --gauge \
   3.292 @@ -1020,26 +996,23 @@
   3.293  
   3.294  usbkey()
   3.295  {
   3.296 -	$DIALOG --clear \
   3.297 -		--title " Create a SliTaz USB key " \
   3.298 +	$DIALOG --clear --title " Create a SliTaz USB key " \
   3.299  		--yes-label "Continue" --yesno \
   3.300  "\nUnlike a hard drive install, the filesystem is kept in a compressed
   3.301  rootfs.gz. The filesystem is loaded entirely into memory upon boot.
   3.302  This should increase responsiveness, protect the filesystem against
   3.303  accidental corruption and reduce read/writes to the USB drive.
   3.304  Once setup, the tazusb utility can rewrite the root filesystem
   3.305 -with any changes you have made since booting up, 
   3.306 +with any changes you have made since booting up,
   3.307  giving the effective benefits of a hard drive install.\n\n
   3.308  /home is mounted on boot using the UUID of your particular flash drive.
   3.309  Unlike a device name, the UUID has the benefit of never changing from machine
   3.310  to machine.\n\n
   3.311 -Please plug your USB stick in now.\n 
   3.312 -" 19 70
   3.313 +Please plug your USB stick in now.\n" 19 70
   3.314  	[ $? -eq 0 ] || return
   3.315  	usbdev || return
   3.316  	exec 3>&1
   3.317 -	format=`$DIALOG  --clear \
   3.318 -	--title " Select the filesystem " \
   3.319 +	format=`$DIALOG  --clear --title " Select the filesystem " \
   3.320  	--radiolist "\nPlease select the filesystem type to create.\n\n\
   3.321  The filesystem creation will erase all the data \
   3.322  in the USB key." 14 70 4 \
   3.323 @@ -1171,9 +1144,7 @@
   3.324  		echo "=== extra ${i#*list} files"
   3.325  		cat $i
   3.326  	done >> $file
   3.327 -	$DIALOG --clear \
   3.328 -		--title " Flavor info " \
   3.329 -		--textbox $file 24 78
   3.330 +	$DIALOG --clear --title " Flavor info " --textbox $file 24 78
   3.331  	rm -rf /tmp/data
   3.332  }
   3.333  
   3.334 @@ -1189,7 +1160,7 @@
   3.335  
   3.336  shell()
   3.337  {
   3.338 -	trap text 2 
   3.339 +	trap text 2
   3.340  	getty -n -l /bin/ash 38400 tty1 || sh
   3.341  }
   3.342  
   3.343 @@ -1218,12 +1189,11 @@
   3.344  isotitle="$(blkid /mnt/$ISO | sed 's/.*LABEL="\([^"]*\).*/\1/')  $(stat \
   3.345  	 -c %y /media/cdrom | sed 's/ .*//')  $(basename $ISO)"
   3.346  while true; do
   3.347 -	trap shell 2 
   3.348 +	trap shell 2
   3.349  	keymap="$(cat /etc/keymap.conf 2> /dev/null)"
   3.350  	locale="$(sed '/^LANG=/!d;s/.*=//' /etc/locale.conf 2> /dev/null)"