[Fai-commit] r6003 - in branches/stable/3.4: bin debian
Michael Prokop
mika at alioth.debian.org
Tue Aug 17 12:55:45 UTC 2010
Author: mika
Date: 2010-08-17 12:55:43 +0000 (Tue, 17 Aug 2010)
New Revision: 6003
Modified:
branches/stable/3.4/bin/ainsl
branches/stable/3.4/bin/dhcp-edit
branches/stable/3.4/bin/fai-cd
branches/stable/3.4/bin/fai-chboot
branches/stable/3.4/bin/fai-class
branches/stable/3.4/bin/fai-debconf
branches/stable/3.4/bin/fai-do-scripts
branches/stable/3.4/bin/fai-mirror
branches/stable/3.4/bin/fcopy
branches/stable/3.4/bin/ftar
branches/stable/3.4/bin/install_packages
branches/stable/3.4/bin/make-fai-nfsroot
branches/stable/3.4/debian/changelog
Log:
fcopy, fai-cd, fai-do-scripts, ftar, fai-debconf, dhcp-edit, fai-class, install_packages, ainsl, fai-mirror, fai-chboot: remove version information, remove e-mail address for bugs
Conflicts:
bin/fai-debconf
bin/fai-mirror
Signed-off-by: Michael Prokop <mika at grml.org>
Modified: branches/stable/3.4/bin/ainsl
===================================================================
--- branches/stable/3.4/bin/ainsl 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/ainsl 2010-08-17 12:55:43 UTC (rev 6003)
@@ -27,8 +27,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#*********************************************************************
-my $version = "Version 2.0, 1-june-2010";
-
use strict;
use Getopt::Std;
@@ -44,9 +42,9 @@
my $exitcode = shift;
print << "EOF";
-ainsl, AppendIfNoSuchLine written in Perl. $version
+ainsl, AppendIfNoSuchLine written in Perl.
- Copyright (C) 2006-2009 by Thomas Lange
+ Copyright (C) 2006-2010 by Thomas Lange
Usage: ainsl [OPTION] FILE LINE [PATTERN]
@@ -59,7 +57,6 @@
-s Convert blanks in line to '\\s+' regexp.
-v Create verbose output.
-Report bugs to <lange\@informatik.uni-koeln.de>.
EOF
exit $exitcode;
}
Modified: branches/stable/3.4/bin/dhcp-edit
===================================================================
--- branches/stable/3.4/bin/dhcp-edit 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/dhcp-edit 2010-08-17 12:55:43 UTC (rev 6003)
@@ -19,7 +19,6 @@
# TODO
# -q quiet: do not print error if host/mac entry not found, exit code 0
-$version="Version 1.2, 6-july-2010";
$dhcpdconf="/etc/dhcp3/dhcpd.conf";
$modified=0; # 1 if dhcpd.conf was modified
@@ -28,10 +27,10 @@
use Pod::Usage;
use Getopt::Std;
-getopts('p:dhnr') || pod2usage(-msg => "edit-dhcp, $version", -verbose => 2);
-$opt_h && pod2usage(-msg => "edit-dhcp, $version",-verbose => 1);
+getopts('p:dhnr') || pod2usage(-msg => "edit-dhcp", -verbose => 2);
+$opt_h && pod2usage(-msg => "edit-dhcp",-verbose => 1);
($hostname,$mac,$ip)= @ARGV;
-$hostname || pod2usage(-msg => "edit-dhcp, $version",-verbose => 1);
+$hostname || pod2usage(-msg => "edit-dhcp",-verbose => 1);
$ip && merror(4,"$ip is not a correct IP address") unless $ip =~ /^[.0-9]{7,15}$/i;
read_dhcpd_conf();
Modified: branches/stable/3.4/bin/fai-cd
===================================================================
--- branches/stable/3.4/bin/fai-cd 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/fai-cd 2010-08-17 12:55:43 UTC (rev 6003)
@@ -30,7 +30,6 @@
#*********************************************************************
set -e
-version="fai-cd 4.1, 28-october-2009"
forceremoval=0;
burn=0
@@ -46,8 +45,7 @@
usage() {
cat <<-EOF
- $version. Copyright (C) 2004-2009 Thomas Lange
- Report bugs to <fai at informatik.uni-koeln.de>.
+ fai-cd Copyright (C) 2004-2009 Thomas Lange
Usage: fai-cd [OPTIONS] -m MIRRORDIR ISONAME
Usage: fai-cd [OPTIONS] -B ISONAME
Modified: branches/stable/3.4/bin/fai-chboot
===================================================================
--- branches/stable/3.4/bin/fai-chboot 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/fai-chboot 2010-08-17 12:55:43 UTC (rev 6003)
@@ -28,7 +28,6 @@
#*********************************************************************
# variable needed: $nfsroot
-$version="version 3.6 25-june-2010";
use Socket;
use Net::hostent;
@@ -223,16 +222,10 @@
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sub usage {
- &VERSION_MESSAGE;
&HELP_MESSAGE;
exit 0;
}
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-sub VERSION_MESSAGE {
-
- print "$0 $version\n";
-}
-# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
sub HELP_MESSAGE {
print << "EOM";
Modified: branches/stable/3.4/bin/fai-class
===================================================================
--- branches/stable/3.4/bin/fai-class 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/fai-class 2010-08-17 12:55:43 UTC (rev 6003)
@@ -27,8 +27,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#*********************************************************************
-version="version 1.5.8, 20-july-2009"
-
# import variables: $LOGDIR $verbose $debug
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
verbosemsg() {
@@ -77,8 +75,7 @@
ex=$1
cat <<-EOF
- fai-class $version. Copyright (C) 2002-2009 Thomas Lange
- Report bugs to <fai at informatik.uni-koeln.de>.
+ fai-class Copyright (C) 2002-2009 Thomas Lange
Usage: fai-class [OPTION] DIRECTORY CLASSFILE
Define classes using files and scripts in DIRECTORY
Modified: branches/stable/3.4/bin/fai-debconf
===================================================================
--- branches/stable/3.4/bin/fai-debconf 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/fai-debconf 2010-08-17 12:55:43 UTC (rev 6003)
@@ -26,8 +26,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#*********************************************************************
-version="version 1.3.2, 18-january-2010"
-
# variables needed: $classes, $ROOTCMD, $LOGDIR, $target
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -89,8 +87,7 @@
local ex=$1
cat <<-EOF
- fai-debconf $version. Copyright (C) 2005-2010 Thomas Lange
- Report bugs to <fai at informatik.uni-koeln.de>.
+ fai-debconf Copyright (C) 2005-2010 Thomas Lange
Usage: fai-debconf [OPTION] DIRECTORY
EOF
Modified: branches/stable/3.4/bin/fai-do-scripts
===================================================================
--- branches/stable/3.4/bin/fai-do-scripts 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/fai-do-scripts 2010-08-17 12:55:43 UTC (rev 6003)
@@ -26,8 +26,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#*********************************************************************
-version="version 1.8, 10-july-2010"
-
# variables needed: $classes, $cfclasses, $LOGDIR
#
# And many other variables like:
@@ -165,7 +163,7 @@
local ex
ex=$1
cat <<-EOF
- fai-do-scripts $version. Copyright (C) 2003-2010 Thomas Lange
+ fai-do-scripts Copyright (C) 2003-2010 Thomas Lange
Read the manual page fai-do-scripts(1) for more information.
Usage: fai-do-scripts [OPTION] DIRECTORY
Modified: branches/stable/3.4/bin/fai-mirror
===================================================================
--- branches/stable/3.4/bin/fai-mirror 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/fai-mirror 2010-08-17 12:55:43 UTC (rev 6003)
@@ -25,8 +25,6 @@
# MA 02111-1307, USA.
#*********************************************************************
-version="Version 1.11, 22-october-2009"
-
# variables: NFSROOT, FAI_CONFIGDIR, FAI_ETC_DIR
export FAI_ROOT=/ # do not execute in chroot, needed for install_packages call
@@ -37,7 +35,6 @@
usage() {
echo "fai-mirror -- create and manage a partial mirror for FAI."
- echo "$version"
echo "Please read the manual page fai-mirror(1)."
exit
}
Modified: branches/stable/3.4/bin/fcopy
===================================================================
--- branches/stable/3.4/bin/fcopy 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/fcopy 2010-08-17 12:55:43 UTC (rev 6003)
@@ -6,7 +6,7 @@
# fcopy -- copy files using FAI classes and preserve directory structure
#
# This script is part of FAI (Fully Automatic Installation)
-# Copyright (C) 2000-2009 Thomas Lange, lange at informatik.uni-koeln.de
+# Copyright (C) 2000-2010 Thomas Lange, lange at informatik.uni-koeln.de
# Universitaet zu Koeln
# Copyright (C) 2001-2005 Henning Glawe, glaweh at physik.fu-berlin.de
# Freie Univeritaet Berlin
@@ -29,8 +29,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#*********************************************************************
-my $version = "Version 2.3.1, 31-july-2009";
-
use strict;
use File::Copy;
use File::Compare;
@@ -378,9 +376,9 @@
sub usage {
print << "EOF";
-fcopy, copy files using classes. $version
+fcopy, copy files using classes.
- Copyright (C) 2001-2006 by Thomas Lange
+ Copyright (C) 2001-2010 by Thomas Lange
Usage: fcopy [OPTION] ... SOURCE ...
@@ -406,7 +404,6 @@
-b backup_dir Where to save backups of overwritten files
-v Create verbose output.
-Report bugs to <lange\@informatik.uni-koeln.de>.
EOF
exit 0;
}
Modified: branches/stable/3.4/bin/ftar
===================================================================
--- branches/stable/3.4/bin/ftar 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/ftar 2010-08-17 12:55:43 UTC (rev 6003)
@@ -27,8 +27,6 @@
# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
#*********************************************************************
-version="Version 1.7, 26-july-2010"
-
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
die() {
echo "ftar died with error: $1"
@@ -50,7 +48,7 @@
usage() {
cat <<EOF
-ftar, extract tar files using classes. $version
+ftar, extract tar files using classes.
Copyright (C) 2001-2010 by Thomas Lange
Modified: branches/stable/3.4/bin/install_packages
===================================================================
--- branches/stable/3.4/bin/install_packages 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/install_packages 2010-08-17 12:55:43 UTC (rev 6003)
@@ -28,7 +28,6 @@
# MA 02111-1307, USA.
#*********************************************************************
-my $version = "Version 4.4.0, 04-july-2010";
$0=~ s#.+/##; # remove path from program name
# import variables: $verbose, $MAXPACKAGES, $classes, $FAI, $FAI_ROOT
@@ -492,7 +491,7 @@
sub usage {
print << "EOF";
-install_packages $version
+install_packages
Please read the manual pages install_packages(8).
EOF
Modified: branches/stable/3.4/bin/make-fai-nfsroot
===================================================================
--- branches/stable/3.4/bin/make-fai-nfsroot 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/bin/make-fai-nfsroot 2010-08-17 12:55:43 UTC (rev 6003)
@@ -34,7 +34,6 @@
cat <<-EOF
Copyright (C) 1999-2010 Thomas Lange
- Report bugs to <fai at informatik.uni-koeln.de>.
Usage: make-fai-nfsroot [OPTIONS]
Create an NFSROOT for FAI.
Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog 2010-08-17 12:55:38 UTC (rev 6002)
+++ branches/stable/3.4/debian/changelog 2010-08-17 12:55:43 UTC (rev 6003)
@@ -53,6 +53,9 @@
if blkid exists before calling it
* fai-debconf: exit 0 all the time, change comment
* ftar, ftar.8: add xz support
+ * fcopy, fai-cd, fai-do-scripts, ftar, fai-debconf, dhcp-edit,
+ fai-class, install_packages, ainsl, fai-mirror, fai-chboot:
+ remove version information, remove e-mail address for bugs
[ Michael Tautschnig ]
* control: Move setup-storage to its own package (fai-setup-storage). Thanks
More information about the Fai-commit
mailing list