iankelling.org
/
git
/
automated-distro-installer
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add arch support, fixup various things
[automated-distro-installer]
/
fai
/
config
/
scripts
/
LAST
/
50-misc
diff --git
a/fai/config/scripts/LAST/50-misc
b/fai/config/scripts/LAST/50-misc
index 62c31db7b3a3ceafe726aa5ad180a387fcce75a8..25b6ce7e239bde45aa96af061dfcd133fe8fc919 100755
(executable)
--- 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
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
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
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
fi
# remove backup files from cfengine, but only if cfengine is installed