summaryrefslogtreecommitdiffstats
path: root/hooks
diff options
context:
space:
mode:
Diffstat (limited to 'hooks')
-rw-r--r--hooks/encrypt13
-rw-r--r--hooks/filesystems1
2 files changed, 1 insertions, 13 deletions
diff --git a/hooks/encrypt b/hooks/encrypt
index 9ae2d45..30dfc12 100644
--- a/hooks/encrypt
+++ b/hooks/encrypt
@@ -3,17 +3,6 @@
# encryption schemes
run_hook ()
{
- replace_root ()
- {
- newcmdline=""
- for cmd in $CMDLINE; do
- case "$cmd" in
- root=*) newcmdline="${newcmdline} root=${1}" ;;
- *) newcmdline="${newcmdline} ${cmd}" ;;
- esac
- done
- export CMDLINE="${newcmdline}"
- }
mkdevice () { /bin/mknod "/dev/mapper/control" c ${1} ${2}; }
/bin/modprobe -a -q dm-crypt >/dev/null 2>&1
@@ -33,7 +22,6 @@ run_hook ()
done
if [ -e "/dev/mapper/root" ]; then
export root="/dev/mapper/root"
- replace_root ${root}
else
err "Password succeeded, but root creation failed, aborting..."
exit 1
@@ -69,7 +57,6 @@ run_hook ()
else
if [ -e "/dev/mapper/root" ]; then
export root="/dev/mapper/root"
- replace_root ${root}
else
err "Password succeeded, but root creation failed, aborting..."
exit 1
diff --git a/hooks/filesystems b/hooks/filesystems
index 4fe655c..55d6725 100644
--- a/hooks/filesystems
+++ b/hooks/filesystems
@@ -22,5 +22,6 @@ run_hook ()
fi
fi
msg " ${FSTYPE}"
+ kinit_params="${kinit_params} rootfstype=${FSTYPE}"
/bin/modprobe -q "${FSTYPE}" >/dev/null 2>&1
}