[Fai-commit] r4893 - in people/michael/features/setup_harddisks_2: . implementation

[mt at alioth.debian.org]

Author: mt
Date: 2008-05-09 20:17:54 +0000 (Fri, 09 May 2008)
New Revision: 4893

Modified:
   people/michael/features/setup_harddisks_2/implementation/setup-storage
   people/michael/features/setup_harddisks_2/setup-storage.8
Log:
changes as suggestd by Thomas


Modified: people/michael/features/setup_harddisks_2/implementation/setup-storage
===================================================================
--- people/michael/features/setup_harddisks_2/implementation/setup-storage	2008-05-09 13:33:20 UTC (rev 4892)
+++ people/michael/features/setup_harddisks_2/implementation/setup-storage	2008-05-09 20:17:54 UTC (rev 4893)
@@ -52,13 +52,19 @@
 
 package FAI;
 
+my $version = "0.1.4893";
+
 # command line parameter handling
 use Getopt::Std;
-our ($opt_X, $opt_f); # the variables for getopt
-&getopts('Xf:') || die <<EOF;
+our ($opt_X, $opt_f, $opt_h, $opt_d); # the variables for getopt
+&getopts('Xf:hd') || die <<EOF;
+setup-storage version $version
+
 USAGE: [-X]                     no test, your harddisks will be formated
                                 default: only test, no real formating
        [-f<config-filename>]    default: parse classes
+       [-d]                     enable debug output (equivalent to debug=1)
+       [-h]                     print this help message
 EOF
 
 # $disklist must be provided by the environment
@@ -101,6 +107,7 @@
 defined ($config_file) or die "No matching disk_config found\n";
 
 # start the parsing - thereby $FAI::configs is filled
+warn "Starting setup-storage $version";
 &FAI::run_parser($config_file);
 
 # read the sizes and partition tables of all disks listed in $FAI::disks

Modified: people/michael/features/setup_harddisks_2/setup-storage.8
===================================================================
--- people/michael/features/setup_harddisks_2/setup-storage.8	2008-05-09 13:33:20 UTC (rev 4892)
+++ people/michael/features/setup_harddisks_2/setup-storage.8	2008-05-09 20:17:54 UTC (rev 4893)
@@ -22,6 +22,8 @@
 .Nm
 .Op Fl X
 .Op Fl f Ar filename
+.Op Fl d
+.Op Fl h
 .Sh DESCRIPTION
 Using FAI disk_config files,
 .Nm
@@ -69,6 +71,12 @@
 is given, the configuration in
 .Ar filename
 is used.
+.Pp
+.It Fl d
+Enable debugging output.
+.Pp
+.It Fl h
+Display the synopsis and version info and exit.
 .El
 .Sh ENVIRONMENT
 .Nm