SliTaz Repositories

     1.1 --- a/tazinst	Tue Jan 07 21:42:05 2014 +0100
     1.2 +++ b/tazinst	Wed Feb 12 22:47:47 2014 +0100
     1.3 @@ -33,7 +33,7 @@
     1.4  [ -r /etc/slitaz/tazinst.conf ] && . /etc/slitaz/tazinst.conf
     1.5  
     1.6  # version
     1.7 -readonly VERSION=3.94
     1.8 +readonly VERSION=3.95
     1.9  
    1.10  # i18n
    1.11  . /usr/bin/gettext.sh
    1.12 @@ -897,19 +897,19 @@
    1.13  # list partitions
    1.14  list_uuid()
    1.15  {
    1.16 -	/sbin/blkid | sort | /bin/busybox awk '
    1.17 -		/UUID/ {
    1.18 -			UUID=substr($0,index($0,"UUID="))
    1.19 -			UUID=substr(UUID,1,index(UUID,"\" "))
    1.20 -			gsub(/"/,"",UUID)
    1.21 -			DEV=substr($1,1,index($1,":")-1)
    1.22 -			printf "%s %s\n", UUID, DEV
    1.23 -		}'
    1.24 +	# list all drives but cdroms
    1.25 +	/sbin/blkid -o export| /bin/busybox awk '
    1.26 +		BEGIN{FS="="}
    1.27 +		/DEVNAME/{dev=$2, type="unknown", label=""}
    1.28 +		/LABEL/{label=$2" "}
    1.29 +		/TYPE/{type=$2}
    1.30 +		/PARTUUID/{if (type != "iso9660"){
    1.31 +			printf "%s %s(%s)\n", dev, label, type}}' | sort -k 2
    1.32  }
    1.33  
    1.34  list_partition_table()
    1.35  {
    1.36 -	/usr/sbin/parted -lm 2>&1 | \
    1.37 +	/usr/sbin/parted -lms 2>&1 | \
    1.38  		/bin/busybox awk -F: '/^\/dev\//{printf "%s: %s\n", $1,$6}'
    1.39  }
    1.40  
    1.41 @@ -938,7 +938,7 @@
    1.42  # list Windows partitions
    1.43  list_winboot()
    1.44  {
    1.45 -	/usr/sbin/parted -lm 2>&1 | /bin/busybox awk '
    1.46 +	/usr/sbin/parted -lms 2>&1 | /bin/busybox awk '
    1.47  	BEGIN{
    1.48  		FS=":"
    1.49  		disknum=-1
    1.50 @@ -1087,7 +1087,7 @@
    1.51  {
    1.52  	local uuid="$1" device
    1.53  	device="$(uuid2disk $uuid)"
    1.54 -	printf "%s" "$(/usr/sbin/parted -lm 2>&1 | grep "$device" | \
    1.55 +	printf "%s" "$(/usr/sbin/parted -lms 2>&1 | grep "$device" | \
    1.56  		cut -d':' -f6)"
    1.57  }
    1.58  
    1.59 @@ -1499,7 +1499,7 @@
    1.60  {
    1.61  	local partition="$(uuid2dev $1)"
    1.62  	partition="${partition%[0-9]}"
    1.63 -	/usr/sbin/parted -lm 2>&1 | grep "^/dev" | \
    1.64 +	/usr/sbin/parted -lms 2>&1 | grep "^/dev" | \
    1.65  		/bin/busybox awk -v PART="$partition" '{if (match($0,PART)) print NR-1}'
    1.66  }
    1.67  
    1.68 @@ -1908,7 +1908,7 @@
    1.69  	# add root device to CHECK_FS in rcS.conf to check filesystem
    1.70  	# on each boot.
    1.71  	log "$(gettext "Adding / partition and CHECK_FS to file /etc/rcS.conf...")"
    1.72 -	sed	-i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$ROOT_UUID\""# etc/rcS.conf
    1.73 +	sed	-i s#'CHECK_FS=\"\"'#"CHECK_FS=\"$(dev2uuid $ROOT_UUID)\""# etc/rcS.conf
    1.74  	# set hostname.
    1.75  	log "$(gettext "Configuring host name:") $HOSTNAME"
    1.76  	printf "%s\n" "$HOSTNAME" > etc/hostname