[Fai-commit] r5732 - in trunk: debian doc lib

[Thomas Lange]

Author: lange
Date: 2010-03-15 20:00:35 +0000 (Mon, 15 Mar 2010)
New Revision: 5732

Modified:
   trunk/debian/changelog
   trunk/doc/fai-guide.txt
   trunk/lib/subroutines
Log:
* list_disks removed
* disk-info: do not return size of disks, return only device names, 
* subroutines: adjust set_disk_info to new behaviour of disk-info

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2010-03-12 14:24:12 UTC (rev 5731)
+++ trunk/debian/changelog	2010-03-15 20:00:35 UTC (rev 5732)
@@ -4,8 +4,11 @@
   * make-fai-nfsroot: fix matching of hook names
   * mkramdisk: do nothing if the variable FAI_NORAMDISK is set to 1
   * subroutines: umount ramdisk in clean_exit()
+  * list_disks removed
+  * disk-info: do not return size of disks, return only device names, 
+  * subroutines: adjust set_disk_info to new behaviour of disk-info
 
- -- Thomas Lange <lange at debian.org>  Wed, 17 Feb 2010 13:32:51 +0100
+ -- Thomas Lange <lange at debian.org>  Mon, 15 Mar 2010 15:47:01 +0100
 
 fai (3.3.3) unstable; urgency=low
 

Modified: trunk/doc/fai-guide.txt
===================================================================
--- trunk/doc/fai-guide.txt	2010-03-12 14:24:12 UTC (rev 5731)
+++ trunk/doc/fai-guide.txt	2010-03-15 20:00:35 UTC (rev 5732)
@@ -5,7 +5,7 @@
 FAI Guide (Fully Automatic Installation)
 ========================================
 Thomas Lange <lange at informatik.uni-koeln.de>
-3.0, Mon, 02 Nov 2009 14:45:42 +0100
+3.0.1, Mon Mar 15 15:44:15 CET 2010
 
 :faiver:  3.3
 :nfsrootsize: 380
@@ -31,7 +31,7 @@
 includes the installation of the package, planning and creating of the
 configuration and how to deal with errors.
 
-(c) 2000-2009 Thomas Lange
+(c) 2000-2010 Thomas Lange
 
 (c) 2005 Henning Glawe
 
@@ -2670,9 +2670,8 @@
 do not forget to remove this file also in the configuration space,
 otherwise it will still be used.
 
-- After calling `set-disk-info`, a list of all local hard disks is
-stored in +$disklist+ and +$device_size+ contains a list of disk
-devices and their sizes.
+- After calling `set_disk_info`, a list of all local hard disks is
+stored in +$disklist+.
 
 - Use `fai-divert -a` if a postinst script calls a configuration
 program, e.g. the postinst script for package apache calls

Modified: trunk/lib/subroutines
===================================================================
--- trunk/lib/subroutines	2010-03-12 14:24:12 UTC (rev 5731)
+++ trunk/lib/subroutines	2010-03-15 20:00:35 UTC (rev 5732)
@@ -614,18 +614,15 @@
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 ### BEGIN SUBROUTINE INFO
-# Provides-Var:    $device_size $disklist
+# Provides-Var:    $disklist
 # Requires-Var:
-# Short-Description: create list of available disks and their sizes
+# Short-Description: create list of available disks
 ### END SUBROUTINE INFO
 
 set_disk_info() {
 
-    # the variable holds a space separated list of devices and their block size
-    device_size=$(disk-info)
-
-    # a list of all local disks, without size
-    disklist=$(list_disks $device_size | sort)
+    # the variable holds a space separated list of devices
+    disklist=$(disk-info | sort)
 }
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 eval_cmdline() {