wok rev 23956

Up tazpanel (636)
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Sep 27 16:29:16 2020 +0000 (4 weeks ago)
parents 425563100416
children 4d0bb1c9d828
files syslinux/stuff/iso2exe/taziso tazpanel/receipt
line diff
     1.1 --- a/syslinux/stuff/iso2exe/taziso	Sat Sep 26 09:25:55 2020 +0000
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun Sep 27 16:29:16 2020 +0000
     1.3 @@ -1028,6 +1028,31 @@
     1.4  	read n
     1.5  }
     1.6  
     1.7 +setcustomconf()
     1.8 +{
     1.9 +	msg="\nUpdate the custom configuration with the files cmdline and initrd\n
    1.10 +in the current directory $PWD. Any missing file is assumed empty.\n\n
    1.11 +$(ls -l $PWD/cmdline $PWD/initrd 2> /dev/null| sed 's|.\{1,30\}||' | \
    1.12 +sed 'N;s|\n|\\n|')"
    1.13 +	[ "$1" ] && echo -e "$msg" ||
    1.14 +	$DIALOG --clear --title " Update custom configuration " \
    1.15 +		--yes-label "Update config" --yesno "$msg\n
    1.16 +\nAre you sure to do the update ?\n" 0 0
    1.17 +	[ $? -eq 0 ] || return
    1.18 +	ddq bs=2k seek=$(customsector) of="$ISO" count=0
    1.19 +	if [ "$(ls $PWD/cmdline $PWD/inird 2> /dev/null)" ]; then
    1.20 +		rm -f /tmp/custom$$ 2>/dev/null
    1.21 +		[ -s $PWD/cmdline ] &&
    1.22 +		echo "append=$(cat $PWD/cmdline)" >>/tmp/custom$$
    1.23 +		[ -s $PWD/initrd ] &&
    1.24 +		echo "initrd:$(stat -c %s $PWD/initrd)" >>/tmp/custom$$ &&
    1.25 +		cat $PWD/initrd >>/tmp/custom$$
    1.26 +		echo "#!boot $(md5sum /tmp/custom$$ | sed 's| .*||')" >>"$ISO"
    1.27 +		cat /tmp/custom$$ >>"$ISO"
    1.28 +		rm -f /tmp/custom$$
    1.29 +	fi
    1.30 +}
    1.31 +
    1.32  isomd5()
    1.33  {
    1.34  	dotwait "Checking iso image"
    1.35 @@ -1202,8 +1227,9 @@
    1.36  		ddq if="$ISO" bs=1024k count=1 skip=$i seek=$i of=$device
    1.37  		echo $((($i*100)/$max))
    1.38  		i=$(($i+1))
    1.39 -	done | dialog --gauge " The ISO image transfer can be long. Please wait..." \
    1.40 -			6 70 0 > /dev/tty 2>&1
    1.41 +	done | { [ "$1" ] || dialog --gauge \
    1.42 +		" The ISO image transfer can be long. Please wait..." \
    1.43 +		6 70 0 > /dev/tty 2>&1; }
    1.44  
    1.45  	# GPT partition + fat32 format for the remaining space
    1.46  	sectors=$(($(sectcnt $device)-1))
    1.47 @@ -1244,7 +1270,7 @@
    1.48  		+ $(get $(($i+1)) $device 1)))
    1.49  	words2bin $(( (-$i -1) % 65536 )) | ddq bs=1 seek=18 of=$device
    1.50  
    1.51 -	$DIALOG --clear --title " Set /home persistent " \
    1.52 +	[ "$1" ] || $DIALOG --clear --title " Set /home persistent " \
    1.53  			--yes-label "Continue" --yesno \
    1.54  "\nThe USB key will run fully in ram. The datas will be lost after each reboot.\n\n
    1.55  This option will mount /home on the USB key vfat during the boot process.\n\n
    1.56 @@ -1602,6 +1628,7 @@
    1.57  $(initx			"text"		"Linux RAM boot") \
    1.58  $(cdfile 'README*'	"readme"	"Show the README file") \
    1.59  $(gotcustomconf		"getcustomconf"	"Get custom config") \
    1.60 +$(noinit		"setcustomconf"	"Set custom config") \
    1.61  $(gotisomd5		"isomd5"	"Check the ISO image") \
    1.62  $(cdfile 'md5sum*'	"md5"		"Check the ISO files") \
    1.63  $(cdfile 'sha*sum*'	"sha"		"Check the ISO files") \
     2.1 --- a/tazpanel/receipt	Sat Sep 26 09:25:55 2020 +0000
     2.2 +++ b/tazpanel/receipt	Sun Sep 27 16:29:16 2020 +0000
     2.3 @@ -1,7 +1,7 @@
     2.4  # SliTaz package receipt.
     2.5  
     2.6  PACKAGE="tazpanel"
     2.7 -VERSION="633"
     2.8 +VERSION="636"
     2.9  CATEGORY="system-tools"
    2.10  SHORT_DESC="SliTaz administration and configuration panel."
    2.11  MAINTAINER="pankso@slitaz.org"