[Fai-commit] r6730 - in test-suite/scenarios/fai40-testing: disk_config scripts/fai40

[Michael Tautschnig]

Author: mt
Date: 2011-10-22 16:14:25 +0000 (Sat, 22 Oct 2011)
New Revision: 6730

Added:
   test-suite/scenarios/fai40-testing/scripts/fai40/30-uuid-default
Modified:
   test-suite/scenarios/fai40-testing/disk_config/FAIBASE
   test-suite/scenarios/fai40-testing/disk_config/FAISERVER
   test-suite/scenarios/fai40-testing/disk_config/LVM_XEN_SERVER
Log:
test: default fstab key is uuid


Modified: test-suite/scenarios/fai40-testing/disk_config/FAIBASE
===================================================================
--- test-suite/scenarios/fai40-testing/disk_config/FAIBASE	2011-10-22 16:09:58 UTC (rev 6729)
+++ test-suite/scenarios/fai40-testing/disk_config/FAIBASE	2011-10-22 16:14:25 UTC (rev 6730)
@@ -2,7 +2,7 @@
 #
 # <type> <mountpoint> <size>   <fs type> <mount options> <misc options>
 
-disk_config disk1 disklabel:msdos bootable:1 fstabkey:uuid
+disk_config disk1 disklabel:msdos bootable:1
 
 primary /      250      ext4  rw,noatime,errors=remount-ro
 logical swap   200-1000 swap  rw                   

Modified: test-suite/scenarios/fai40-testing/disk_config/FAISERVER
===================================================================
--- test-suite/scenarios/fai40-testing/disk_config/FAISERVER	2011-10-22 16:09:58 UTC (rev 6729)
+++ test-suite/scenarios/fai40-testing/disk_config/FAISERVER	2011-10-22 16:14:25 UTC (rev 6730)
@@ -2,7 +2,7 @@
 #
 # <type> <mountpoint> <size>   <fs type> <mount options> <misc options>
 
-disk_config disk1 disklabel:msdos fstabkey:uuid
+disk_config disk1 disklabel:msdos
 
 primary  /             300	  ext4   rw,noatime,errors=remount-ro
 logical  swap          200-1000   swap   rw                   

Modified: test-suite/scenarios/fai40-testing/disk_config/LVM_XEN_SERVER
===================================================================
--- test-suite/scenarios/fai40-testing/disk_config/LVM_XEN_SERVER	2011-10-22 16:09:58 UTC (rev 6729)
+++ test-suite/scenarios/fai40-testing/disk_config/LVM_XEN_SERVER	2011-10-22 16:14:25 UTC (rev 6730)
@@ -1,4 +1,4 @@
-disk_config disk1  fstabkey:uuid
+disk_config disk1
 primary /boot       100       ext4    rw
 primary swap        256       swap    sw
 primary /           2000      ext4    rw

Added: test-suite/scenarios/fai40-testing/scripts/fai40/30-uuid-default
===================================================================
--- test-suite/scenarios/fai40-testing/scripts/fai40/30-uuid-default	                        (rev 0)
+++ test-suite/scenarios/fai40-testing/scripts/fai40/30-uuid-default	2011-10-22 16:14:25 UTC (rev 6730)
@@ -0,0 +1,10 @@
+#! /bin/bash
+
+error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
+
+if grep -q fstabkey:uuid $FAI/disk_config/* ; then
+  error=1
+fi
+grep '^UUID=' $FAI_ROOT/etc/fstab
+
+exit $error


Property changes on: test-suite/scenarios/fai40-testing/scripts/fai40/30-uuid-default
___________________________________________________________________
Added: svn:executable
   + *