[Fai-commit] r5506 - in trunk: bin lib

[Thomas Lange]

Author: lange
Date: 2009-08-28 04:10:27 +0000 (Fri, 28 Aug 2009)
New Revision: 5506

Modified:
   trunk/bin/setup_harddisks
   trunk/lib/subroutines-linux
Log:
move warning into the script itself


Modified: trunk/bin/setup_harddisks
===================================================================
--- trunk/bin/setup_harddisks	2009-08-28 04:04:05 UTC (rev 5505)
+++ trunk/bin/setup_harddisks	2009-08-28 04:10:27 UTC (rev 5506)
@@ -7,7 +7,7 @@
 #
 # This script is part of FAI (Fully Automatic Installation)
 # Copyright (c) 1999, 2000 by ScALE Workgroup, Universitaet zu Koeln
-# Copyright (c) 2000-2007 by Thomas Lange, Uni Koeln
+# Copyright (c) 2000-2009 by Thomas Lange, Uni Koeln
 #
 #*********************************************************************
 # This program is free software; you can redistribute it and/or modify
@@ -226,6 +226,8 @@
 ";
 
 print "setup_harddisks $Version\n";
+print "WARNING: setup_harddisks is deprecated and will be removed in the future.\n";
+print "WARNING: Please use setup-storage(8) instead.\n";
 if (defined $opt_X){
     $test = 2;
 } else {

Modified: trunk/lib/subroutines-linux
===================================================================
--- trunk/lib/subroutines-linux	2009-08-28 04:04:05 UTC (rev 5505)
+++ trunk/lib/subroutines-linux	2009-08-28 04:10:27 UTC (rev 5506)
@@ -125,8 +125,6 @@
 	[ ! -s $LOGDIR/disk_var.sh ] && setup-storage -X 2>&1 | tee $LOGDIR/format.log 
     else
 	echo "Partitioning local harddisks using setup_harddisks"
-	echo "WARNING: setup_harddisks is deprecated and will be removed in the future."
-	echo "WARNING: Please use setup-storage(8) instead."
 	[ ! -s $LOGDIR/disk_var.sh ] && setup_harddisks -d -X 2>&1 | tee $LOGDIR/format.log
     fi