[Fai-commit] r5972 - in branches/stable/3.4: debian lib

[Michael Prokop]

Author: mika
Date: 2010-08-17 12:52:46 +0000 (Tue, 17 Aug 2010)
New Revision: 5972

Modified:
   branches/stable/3.4/debian/changelog
   branches/stable/3.4/lib/disk-info
Log:
disk-info: rename subroutine


Signed-off-by: Michael Prokop <mika at grml.org>

Modified: branches/stable/3.4/debian/changelog
===================================================================
--- branches/stable/3.4/debian/changelog	2010-08-17 12:52:41 UTC (rev 5971)
+++ branches/stable/3.4/debian/changelog	2010-08-17 12:52:46 UTC (rev 5972)
@@ -9,6 +9,7 @@
   * updatebase: remove pre-lenny code
   * make-fai-nfsroot, make-fai-nfsroot.8: add option -B, (closes: #576092)
     (thanks to Mika Prokop for the patch)
+  * disk-info: rename subroutine
 
  -- Thomas Lange <lange at debian.org>  Mon, 14 Jun 2010 20:26:25 +0200
 

Modified: branches/stable/3.4/lib/disk-info
===================================================================
--- branches/stable/3.4/lib/disk-info	2010-08-17 12:52:41 UTC (rev 5971)
+++ branches/stable/3.4/lib/disk-info	2010-08-17 12:52:46 UTC (rev 5972)
@@ -6,7 +6,7 @@
 # Short-Description: <task desc.>
 ### END SUBROUTINE INFO
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-diskandsize() {
+checkdisk() {
 
     while read major minor blocks device suffix; do
 	isdisk=1
@@ -19,6 +19,6 @@
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # echo a space separated list of devices and their block size
-egrep ' etherd/e[[:digit:]]+\.[[:digit:]]+\b| i2o/hd.\b| cciss/c.d.\b| ida/c.d.\b| rd/c.d.\b| hd.\b| sd[a-z]{1,2}\b|/disc\b| vd.\b| xvd.\b' /proc/partitions | diskandsize
+egrep ' etherd/e[[:digit:]]+\.[[:digit:]]+\b| i2o/hd.\b| cciss/c.d.\b| ida/c.d.\b| rd/c.d.\b| hd.\b| sd[a-z]{1,2}\b|/disc\b| vd.\b| xvd.\b' /proc/partitions | checkdisk