slitaz-tools rev 496

bootfloppybox: fix floppy hardware detection & browser
author Pascal Bellard <pascal.bellard@slitaz.org>
date Tue Jul 06 17:57:47 2010 +0200 (2010-07-06)
parents 5c9e9f6f83db
children 0bbb123aed02
files tinyutils/bootfloppybox
line diff
     1.1 --- a/tinyutils/bootfloppybox	Mon Jul 05 17:52:24 2010 +0200
     1.2 +++ b/tinyutils/bootfloppybox	Tue Jul 06 17:57:47 2010 +0200
     1.3 @@ -2,7 +2,7 @@
     1.4  # 
     1.5  # Gtkdialog box for the mount command. Part of SliTaz tools.
     1.6  #
     1.7 -VERSION=20100401
     1.8 +VERSION=20100701
     1.9  
    1.10  # Check if user is root.
    1.11  check_root()
    1.12 @@ -28,14 +28,17 @@
    1.13  	esac
    1.14  }
    1.15  
    1.16 +# Trigger floppy driver to update /sys/devices/platform/
    1.17 +dd if=/dev/fd0 bs=1k count=1 > /dev/null 2>&1
    1.18 +
    1.19  # check or list floppy devices.
    1.20  list_floppy()
    1.21  {
    1.22  	local list
    1.23  	list=""
    1.24 -	for i in /sys/devices/platform/floppy.*/block:*; do
    1.25 +	for i in /sys/devices/platform/floppy.*/block/*; do
    1.26  		[ -d $i ] || continue
    1.27 -		list="$list ${i#*block:}"
    1.28 +		list="$list $(basename $i)"
    1.29  	done
    1.30  	[ -n "$1" ] || echo $list
    1.31  	[ -n "$list" ]
    1.32 @@ -1228,7 +1231,7 @@
    1.33        <button>
    1.34          <input file icon=\"browser\"></input>
    1.35  	<label>Wiki</label>
    1.36 -	<action>firefox http://wiki.slitaz.org/doku.php?id=quickstart:pxe &</action>
    1.37 +	<action>browser http://wiki.slitaz.org/doku.php?id=quickstart:pxe &</action>
    1.38        </button>
    1.39  "
    1.40      elif [ "$pkg" = "gpxe" ]; then
    1.41 @@ -1245,7 +1248,7 @@
    1.42        <button>
    1.43          <input file icon=\"browser\"></input>
    1.44  	<label>Wiki</label>
    1.45 -	<action>firefox http://wiki.slitaz.org/doku.php?id=quickstart:pxe &</action>
    1.46 +	<action>browser http://wiki.slitaz.org/doku.php?id=quickstart:pxe &</action>
    1.47        </button>
    1.48        <button help>
    1.49  	<action type=\"launch\">HELP</action>
    1.50 @@ -1264,7 +1267,7 @@
    1.51        <button>
    1.52          <input file icon=\"browser\"></input>
    1.53  	<label>Web</label>
    1.54 -	<action>firefox $WEB_SITE &</action>
    1.55 +	<action>browser $WEB_SITE &</action>
    1.56        </button>
    1.57  "
    1.58      fi