X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fscripts%2FLAST%2F50-misc;fp=fai%2Fconfig%2Fscripts%2FLAST%2F50-misc;h=25b6ce7e239bde45aa96af061dfcd133fe8fc919;hb=a6f3eaed0a1eebb5c58853fb9faa8bfbec404de3;hp=62c31db7b3a3ceafe726aa5ad180a387fcce75a8;hpb=5ba4947c2a95c36034491b616d33efe3da1c1743;p=automated-distro-installer

diff --git a/fai/config/scripts/LAST/50-misc b/fai/config/scripts/LAST/50-misc
index 62c31db..25b6ce7 100755
--- a/fai/config/scripts/LAST/50-misc
+++ b/fai/config/scripts/LAST/50-misc
@@ -4,20 +4,24 @@
 
 error=0; trap 'error=$(($?>$error?$?:$error))' ERR # save maximum error code
 
-# check if mdadm has been forgotten
-if grep -q active /proc/mdstat 2>/dev/null; then
+if [ "$FAI_ACTION" = "dirinstall" ] ; then
+  :
+else
+  # check if mdadm has been forgotten
+  if grep -q active /proc/mdstat 2>/dev/null; then
     if [ ! -d $target/etc/mdadm ]; then
 	echo ERROR: Found Software RAID, but the mdadm package was not installed
 	error=1
     fi
-fi
+  fi
 
-usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
-if [ $usedm -ne 0 ]; then
+  usedm=$(dmsetup ls | egrep -v '^live-rw|^live-base|^No devices found' | wc -l)
+  if [ $usedm -ne 0 ]; then
     if [ ! -d $target/etc/lvm ]; then
 	echo ERROR: Found lvm devices, but the lvm2 package was not installed
 	error=1
     fi
+  fi
 fi
 
 # remove backup files from cfengine, but only if cfengine is installed