[arch-projects] [mkinitcpio][PATCH 1/2] keymap: fall back to us if KEYMAP is not defined
ref: https://bugs.archlinux.org/task/44805 --- install/keymap | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/install/keymap b/install/keymap index c1948b1..7de6acb 100644 --- a/install/keymap +++ b/install/keymap @@ -14,16 +14,11 @@ build() { [[ $LANG ]] && LOCALE=$LANG LANG=$l - if [[ $KEYMAP ]]; then - if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then - touch "$BUILDROOT/keymap.utf8" - uc=-u - fi - loadkeys -q $uc $KEYMAP -b > "$BUILDROOT/keymap.bin" - else - warning "keymap: hook specified, but no KEYMAP found in configuration" - return 1 + if [[ $LOCALE = *[Uu][Tt][Ff]?(-)8 ]]; then + touch "$BUILDROOT/keymap.utf8" + uc=-u fi + loadkeys -q $uc ${KEYMAP:-us} -b > "$BUILDROOT/keymap.bin" ) && add_runscript } -- 2.8.3
rootfstype is handled by the kernel, so we should handle it, too. ref: https://bugs.archlinux.org/task/45117 --- init_functions | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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) ..." -- 2.8.3
participants (1)
-
Dave Reisner