tazinst diff tazinst @ rev 103

installer.cgi: typos
author Pascal Bellard <pascal.bellard@slitaz.org>
date Sun Aug 09 18:31:30 2020 +0000 (2020-08-09)
parents fc57e40b85bc
children 873255cb1674
line diff
     1.1 --- a/tazinst	Sat Aug 08 17:52:08 2020 +0000
     1.2 +++ b/tazinst	Sun Aug 09 18:31:30 2020 +0000
     1.3 @@ -938,7 +938,7 @@
     1.4  # list Windows partitions
     1.5  list_winboot()
     1.6  {
     1.7 -	/usr/sbin/parted -lms 2>&1 | /bin/busybox awk '
     1.8 +	/usr/sbin/parted -lms 2>&1 | sed '/zram/,$d' | /bin/busybox awk '
     1.9  	BEGIN{
    1.10  		FS=":"
    1.11  		disknum=-1
    1.12 @@ -1108,7 +1108,7 @@
    1.13  	local uuid="$1" removable=1
    1.14  	local disk="$(uuid2disk $uuid | /bin/busybox awk '{print substr($0,6,3)}')"
    1.15  	if [ "$(printf "%s" $disk | wc -w)" -eq "1" ]; then
    1.16 -		[ "$(cat /sys/block/"$disk"/removable)" -gt "0" ] \
    1.17 +		[ "$(cat /sys/block/"$disk"/removable 2> /dev/null)" -gt "0" ] \
    1.18  			&& removable=0
    1.19  	fi
    1.20  	return "$removable"
    1.21 @@ -2217,6 +2217,7 @@
    1.22  	new)
    1.23  		new_file "$2" ;;
    1.24  	set)
    1.25 +		[ -s "$4" ] || new_file "$4"
    1.26  		read_file "$4"
    1.27  		change "$2" "$3" "$4" ;;
    1.28  	unset)