[Fai-commit] r5081 - in trunk: debian examples/simple/class examples/simple/disk_config

[lange at alioth.debian.org]

Author: lange
Date: 2008-09-05 08:29:57 +0000 (Fri, 05 Sep 2008)
New Revision: 5081

Modified:
   trunk/debian/changelog
   trunk/examples/simple/class/FAIBASE.var
   trunk/examples/simple/disk_config/FAIBASE
Log:
use new partition tool in simple examples

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2008-09-05 08:27:12 UTC (rev 5080)
+++ trunk/debian/changelog	2008-09-05 08:29:57 UTC (rev 5081)
@@ -22,8 +22,9 @@
   * remove old unused tlink util and info about it
   * remove make-fai-bootfloppy script and man page
     (closes: #452375, #400373, #305363)
+  * use new partition tool in simple examples
   
- -- Thomas Lange <lange at debian.org>  Thu, 04 Sep 2008 17:20:24 +0200
+ -- Thomas Lange <lange at debian.org>  Fri, 05 Sep 2008 10:29:02 +0200
 
 fai (3.2.9) unstable; urgency=low
 

Modified: trunk/examples/simple/class/FAIBASE.var
===================================================================
--- trunk/examples/simple/class/FAIBASE.var	2008-09-05 08:27:12 UTC (rev 5080)
+++ trunk/examples/simple/class/FAIBASE.var	2008-09-05 08:29:57 UTC (rev 5081)
@@ -22,3 +22,6 @@
 
 # erros in tasks greater than this value will cause the installation to stop
 STOP_ON_ERROR=700
+
+# use the new partitioning tool
+USE_SETUP_STORAGE=1

Modified: trunk/examples/simple/disk_config/FAIBASE
===================================================================
--- trunk/examples/simple/disk_config/FAIBASE	2008-09-05 08:27:12 UTC (rev 5080)
+++ trunk/examples/simple/disk_config/FAIBASE	2008-09-05 08:29:57 UTC (rev 5081)
@@ -1,13 +1,12 @@
-# generic disk configuration for one small disk
-# disk size from 500Mb up to what you can buy today
+# example of new config file for setup-storage
 #
-# <type> <mountpoint> <size in mb> [mount options]     [;extra options]
+# <type> <mountpoint> <size>   <fs type> <mount options> <misc options>
 
-disk_config disk1
-primary  /             150-300      rw,errors=remount-ro ; -c -j ext3
-logical  swap          40-500      rw                   
-logical  /var          90-1000     rw                   ; -m 5  -j ext3
-logical  /tmp          50-1000     rw                   ; -m 0 -j ext3
-logical  /usr          200-4000    rw                   ; -j ext3
-logical  /home         50-         rw,nosuid            ; -m 1 -j ext3
-# logical /home        preserve9   rw,nosuid            ; -m 1 -j ext3
+disk_config disk1 disklabel:msdos
+
+primary  /             250	  ext3   rw,errors=remount-ro
+logical  swap          200-1000   swap   rw                   
+logical  /var          600-1300   ext3   rw         createopts="-m 5" tuneopts="-c 0 -i 0"
+logical  /tmp          100-1000   ext3   rw         createopts="-m 0" tuneopts="-c 0 -i 0"
+logical  /usr          1000-8000  ext3   rw
+logical  /home         100-50%    ext3   rw,nosuid  createopts="-m 1" tuneopts="-c 0 -i 0"