mirror of
https://gitlab.archlinux.org/tpowa/archboot.git
synced 2024-09-20 03:50:37 +02:00
fixed advanced_root array
This commit is contained in:
parent
70908c5674
commit
615e1e58ba
5 changed files with 8 additions and 8 deletions
|
@ -2,23 +2,17 @@
|
||||||
run_hook ()
|
run_hook ()
|
||||||
{
|
{
|
||||||
if ! [ "${root}" = "" -a "${ip}" = "" -a "${advanced}" = "" ]; then
|
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 lvm && export LVMRUN=1
|
||||||
echo $HOOKS | grep -q mdadm && export MDADMRUN=1
|
echo $HOOKS | grep -q mdadm && export MDADMRUN=1
|
||||||
echo $HOOKS | grep -q encrypt && export ENCRYPTRUN=1
|
echo $HOOKS | grep -q encrypt && export ENCRYPTRUN=1
|
||||||
if [ -e "/hooks" ]; then
|
|
||||||
for h in ${HOOKS}; do
|
for h in ${HOOKS}; do
|
||||||
TST=""
|
|
||||||
eval "TST=\$hook_${h}"
|
|
||||||
if [ "${TST}" != "disabled" ]; then
|
|
||||||
run_hook () { msg "${h}: no run function defined"; }
|
run_hook () { msg "${h}: no run function defined"; }
|
||||||
if [ -e "/hooks/${h}" ]; then
|
if [ -e "/hooks/${h}" ]; then
|
||||||
. /hooks/${h}
|
. /hooks/${h}
|
||||||
msg ":: Running Hook [${h}]"
|
msg ":: Running Hook [${h}]"
|
||||||
run_hook
|
run_hook
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
done
|
done
|
||||||
fi
|
|
||||||
fi
|
fi
|
||||||
}
|
}
|
|
@ -127,5 +127,7 @@ run_hook ()
|
||||||
fi
|
fi
|
||||||
nuke ${ckeyfile}
|
nuke ${ckeyfile}
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
msg ":: SKipping already run by arch_root_advanced hook..."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,5 +16,7 @@ run_hook ()
|
||||||
msg "Activating logical volumes..."
|
msg "Activating logical volumes..."
|
||||||
/sbin/lvm vgchange --ignorelockingfailure -ay
|
/sbin/lvm vgchange --ignorelockingfailure -ay
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
msg ":: SKipping already run by arch_root_advanced hook..."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
|
@ -50,5 +50,7 @@ run_hook ()
|
||||||
# assemble everything
|
# assemble everything
|
||||||
/sbin/mdassemble.static
|
/sbin/mdassemble.static
|
||||||
fi
|
fi
|
||||||
|
else
|
||||||
|
msg ":: SKipping already run by arch_root_advanced hook..."
|
||||||
fi
|
fi
|
||||||
}
|
}
|
|
@ -12,7 +12,7 @@ help ()
|
||||||
{
|
{
|
||||||
cat <<HELPEOF
|
cat <<HELPEOF
|
||||||
This hook will override advanced hooks for your system.
|
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.
|
to override the defaults.
|
||||||
HELPEOF
|
HELPEOF
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue