SliTaz Repositories

     1.1 --- a/lib/libmountbox	Wed Jul 23 21:22:49 2008 +0000
     1.2 +++ b/lib/libmountbox	Tue Nov 25 15:51:10 2008 +0100
     1.3 @@ -62,12 +62,15 @@
     1.4  			elif mount | grep -q "^$dev "; then
     1.5  				continue
     1.6  			else
     1.7 -				echo "$dev | $BOOT | $START | $END | $BLOCKS | $ID | $SYSTEM"
     1.8 +				UUID=`blkid | grep ^$dev | grep UUID= | sed 's/.*UUID=\"\([^\"]*\)\".*/\1/'`
     1.9 +				TYPE=`blkid | grep ^$dev | grep TYPE= | sed 's/.*TYPE=\"\([^\"]*\)\".*/\1/'`
    1.10 +				LABEL=`blkid | grep ^$dev | grep LABEL= | sed 's/.*LABEL=\"\([^\"]*\)\".*/\1/'`
    1.11 +				echo "$dev | $BOOT | $START | $END | $BLOCKS | $ID | $SYSTEM | $TYPE | $LABEL | $UUID"
    1.12  			fi
    1.13  		done
    1.14 -		echo "/dev/cdrom | - | - | - | CD/DVD | - | iso9660"
    1.15 +		echo "/dev/cdrom | - | - | - | CD/DVD | - | iso9660 | - | - | -"
    1.16  		for i in /sys/devices/platform/floppy.*/block:*; do 
    1.17 -			[ -e $i ] && echo "/dev/${i#*block:} | - | - | - | floppy | - | linux"
    1.18 +			[ -e $i ] && echo "/dev/${i#*block:} | - | - | - | floppy | - | - | - | - | -"
    1.19  		done
    1.20  		;;
    1.21  	mounted-fs-infos)
    1.22 @@ -102,8 +105,9 @@
    1.23  </window>"
    1.24  		gtkdialog --center --program=MOUNTED_DEVICE
    1.25  		else
    1.26 -			UUID=`blkid | grep ^$MOUNTED | sed 's/.*UUID=\"\([^ ]*\)\".*/\1/'`
    1.27 -			TYPE=`blkid | grep ^$MOUNTED | sed 's/.*TYPE=\"\([^ ]*\)\".*/\1/'`
    1.28 +			UUID=`blkid | grep ^$MOUNTED | grep UUID= | sed 's/.*UUID=\"\([^\"]*\)\".*/\1/'`
    1.29 +			TYPE=`blkid | grep ^$MOUNTED | grep TYPE= | sed 's/.*TYPE=\"\([^\"]*\)\".*/\1/'`
    1.30 +			LABEL=`blkid | grep ^$MOUNTED | grep LABEL= | sed 's/.*LABEL=\"\([^\"]*\)\".*/\1/'`
    1.31  			RES=`df -h $MOUNTED | grep ^$MOUNTED`
    1.32  			mounted_fs_data
    1.33  			export MOUNTED_DEVICE="
    1.34 @@ -115,6 +119,7 @@
    1.35  
    1.36  UUID: $UUID
    1.37  Type: $TYPE
    1.38 +Label: $LABEL
    1.39  \"
    1.40  		</label>
    1.41  	</text>
    1.42 @@ -143,8 +148,9 @@
    1.43  	umounted-fs-infos)
    1.44  		# Mounted fs info and actions, rootfs or other fs.
    1.45  		#
    1.46 -		UUID=`blkid | grep ^$DEVICE | sed 's/.*UUID=\"\([^ ]*\)\".*/\1/'`
    1.47 -		TYPE=`blkid | grep ^$DEVICE | sed 's/.*TYPE=\"\([^ ]*\)\".*/\1/'`
    1.48 +		UUID=`blkid | grep ^$MOUNTED | grep UUID= | sed 's/.*UUID=\"\([^\"]*\)\".*/\1/'`
    1.49 +		TYPE=`blkid | grep ^$MOUNTED | grep TYPE= | sed 's/.*TYPE=\"\([^\"]*\)\".*/\1/'`
    1.50 +		LABEL=`blkid | grep ^$MOUNTED | grep LABEL= | sed 's/.*LABEL=\"\([^\"]*\)\".*/\1/'`
    1.51  		export UMOUNTED_DEVICE="
    1.52  <window title=\"Device: $DEVICE\" icon-name=\"media-flash\">
    1.53  <vbox>
    1.54 @@ -154,6 +160,7 @@
    1.55  
    1.56  UUID: $UUID
    1.57  Type: $TYPE
    1.58 +Label: $LABEL
    1.59  \"
    1.60  		</label>
    1.61  	</text>