summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2016-07-02 17:06:50 +0200
committerDave Reisner <dreisner@archlinux.org>2016-07-02 19:51:05 +0200
commit14487ea9a6104c17b00c6fa7bcb65c617c7490c8 (patch)
tree7fe3ef0afd096596a7159c4c3cce3466b7a9e2c5
parent89bf8b56137196907b25e9d131e82dec90edaff0 (diff)
downloadmkinitcpio-14487ea9a6104c17b00c6fa7bcb65c617c7490c8.tar.gz
mkinitcpio-14487ea9a6104c17b00c6fa7bcb65c617c7490c8.tar.xz
init: handle rootfstype as a synonym for fstype
rootfstype is handled by the kernel, so we should handle it, too. ref: https://bugs.archlinux.org/task/45117
-rw-r--r--init_functions3
1 files changed, 2 insertions, 1 deletions
diff --git a/init_functions b/init_functions
index 11ce3ca..05f4ab0 100644
--- a/init_functions
+++ b/init_functions
@@ -124,6 +124,7 @@ parse_cmdline() {
\#*) break ;;
# special cases
rw|ro) rwopt=$_w ;;
+ fstype) rootfstype=$_w ;;
fsck.mode=*)
case ${_w#*=} in
force)
@@ -323,7 +324,7 @@ default_mount_handler() {
fi
msg ":: mounting '$root' on real root"
- if ! mount ${fstype:+-t $fstype} -o ${rwopt:-ro}${rootflags:+,$rootflags} "$root" "$1"; then
+ if ! mount ${rootfstype:+-t $rootfstype} -o ${rwopt:-ro}${rootflags:+,$rootflags} "$root" "$1"; then
echo "You are now being dropped into an emergency shell."
launch_interactive_shell
msg "Trying to continue (this will most likely fail) ..."