extra hd: fix mountpoint check.

[people/pmueller/ipfire-2.x.git] / html / cgi-bin / extrahd.cgi

diff --git a/html/cgi-bin/extrahd.cgi b/html/cgi-bin/extrahd.cgi
index d46956e7db834f06140b36e7ae35f06e5febef5b..2ea41788654939dc488cfce277b49d6c574d2f73 100644 (file)
--- a/html/cgi-bin/extrahd.cgi
+++ b/html/cgi-bin/extrahd.cgi
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2010  IPFire Team  <info@ipfire.org>                          #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -48,8 +48,8 @@ my $partitionentry = "";
 my $devicefile = "/var/ipfire/extrahd/devices";
 my $scanfile = "/var/ipfire/extrahd/scan";
 my $partitionsfile = "/var/ipfire/extrahd/partitions";
-system("/usr/local/bin/scanhd ide");
-system("/usr/local/bin/scanhd partitions");
+system("/usr/local/bin/extrahdctrl scanhd ide");
+system("/usr/local/bin/extrahdctrl scanhd partitions");
 
 &Header::showhttpheaders();
 
@@ -58,6 +58,7 @@ $extrahdsettings{'PATH'} = '';
 $extrahdsettings{'FS'} = '';
 $extrahdsettings{'DEVICE'} = '';
 $extrahdsettings{'ACTION'} = '';
+$extrahdsettings{'UUID'} = '';
 
 &General::readhash("${General::swroot}/extrahd/settings", \%extrahdsettings);
 &Header::getcgihash(\%extrahdsettings);
@@ -89,7 +90,7 @@ if ($extrahdsettings{'ACTION'} eq $Lang::tr{'add'})
        if ( "$ok" eq "true" ) {
                open(FILE, ">> $devicefile" ) or die "Unable to write $devicefile";
                print FILE <<END
-$extrahdsettings{'DEVICE'};$extrahdsettings{'FS'};$extrahdsettings{'PATH'};
+UUID=$extrahdsettings{'UUID'};$extrahdsettings{'FS'};$extrahdsettings{'PATH'};
 END
 ;
        system("/usr/local/bin/extrahdctrl mount $extrahdsettings{'PATH'}");
@@ -138,12 +139,12 @@ END
        {
                @deviceline = split( /\;/, $deviceentry );
                my $color="$Header::colourred";
-               if ( `/bin/mount | /bin/fgrep $deviceline[2] | /bin/fgrep /dev/$deviceline[0]` ) {
+               if ( ! `/bin/mountpoint $deviceline[2] | grep " not "`  ) {
                        $color=$Header::colourgreen;
                }
                print <<END
                        <tr><td colspan="5">&nbsp;
-                       <tr><td align='center'><font color=$color><b>/dev/$deviceline[0]</b></font>
+                       <tr><td align='center'><font color=$color><b>$deviceline[0]</b></font>
                                <td align='center'>$deviceline[1]
                                <td align='center'>$deviceline[2]
                                <td align='center'>
@@ -164,7 +165,7 @@ END
 
 &Header::closebox();
 
-&Header::openbox('100%', 'center', $Lang::tr{'extrahd founded drives'});
+&Header::openbox('100%', 'center', $Lang::tr{'extrahd detected drives'});
        print <<END
                <table border='0' width='600' cellspacing="0">
 END
@@ -180,7 +181,7 @@ END
                @scanline = split( /\;/, $scanentry );
                print <<END
                        <tr><td colspan="5">&nbsp;
-                       <tr><td align='center'><b>/dev/$scanline[0]</b>
+                       <tr><td align='left' colspan="2"><b>/dev/$scanline[0]</b>
                                <td align='center' colspan="2">$scanline[1]
 END
 ;
@@ -205,9 +206,11 @@ END
                                $size = int($partitionline[1] / 1024);
                                print <<END
                                <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-                               <tr><td align="center">/dev/$partitionline[0]
+                               <tr><td align="left" colspan=5><b>UUID=$partitionline[2]</b></td></tr>
+                               <tr>
+                               <td align="list">/dev/$partitionline[0]</td>
                                <td align="center">$Lang::tr{'size'} $size MB
-                               <td align='center'><select name="FS">
+                               <td align="center"><select name="FS">
                                                                                <option value="auto">auto</option>
                                                                                <option value="ext3">ext3</option>
                                                                                <option value="reiserfs">reiserfs</option>
@@ -217,6 +220,7 @@ END
                                <td align="center"><input type='text' name='PATH' value=/mnt/harddisk />
                                <td align="center">
                                        <input type='hidden' name='DEVICE' value='$partitionline[0]' />
+                                       <input type='hidden' name='UUID' value='$partitionline[2]' />
                                        <input type='hidden' name='ACTION' value=$Lang::tr{'add'} />
                                        <input type='image' alt=$Lang::tr{'add'} src='/images/add.gif' />
                                </form>