fixed advanced_root array

This commit is contained in:
Tobias Powalowski 2009-07-26 18:18:30 +02:00
parent 70908c5674
commit 615e1e58ba
5 changed files with 8 additions and 8 deletions

View file

@ -2,23 +2,17 @@
run_hook ()
{
if ! [ "${root}" = "" -a "${ip}" = "" -a "${advanced}" = "" ]; then
HOOKS="$(echo ${advanced})"
HOOKS="$(echo ${advanced} | sed -e 's#,# #g')"
echo $HOOKS | grep -q lvm && export LVMRUN=1
echo $HOOKS | grep -q mdadm && export MDADMRUN=1
echo $HOOKS | grep -q encrypt && export ENCRYPTRUN=1
if [ -e "/hooks" ]; then
for h in ${HOOKS}; do
TST=""
eval "TST=\$hook_${h}"
if [ "${TST}" != "disabled" ]; then
run_hook () { msg "${h}: no run function defined"; }
if [ -e "/hooks/${h}" ]; then
. /hooks/${h}
msg ":: Running Hook [${h}]"
run_hook
fi
fi
done
fi
fi
}

View file

@ -127,5 +127,7 @@ run_hook ()
fi
nuke ${ckeyfile}
fi
else
msg ":: SKipping already run by arch_root_advanced hook..."
fi
}

View file

@ -16,5 +16,7 @@ run_hook ()
msg "Activating logical volumes..."
/sbin/lvm vgchange --ignorelockingfailure -ay
fi
else
msg ":: SKipping already run by arch_root_advanced hook..."
fi
}

View file

@ -50,5 +50,7 @@ run_hook ()
# assemble everything
/sbin/mdassemble.static
fi
else
msg ":: SKipping already run by arch_root_advanced hook..."
fi
}

View file

@ -12,7 +12,7 @@ help ()
{
cat <<HELPEOF
This hook will override advanced hooks for your system.
Use advanced="your hooks hooks" eg. advanced="encrypt mdadm"
Use advanced=hook1,hook2,hook3 eg. advanced=arch_encrypt,arch_mdadm
to override the defaults.
HELPEOF
}