Allow init=??? syntax again

Using an explicit set of params passed to kinit is annoying, because we
forget things like this.

Add init=??? syntax again, for i.e. init=/bin/bash to recover a root
password

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

2 files changed, 10 insertions, 8 deletions

diff --git a/init b/init
index 3511286..b8ee065 100644
--- a/init
+++ b/init
@@ -21,6 +21,8 @@ for cmd in $CMDLINE; do
         \#*) break ;; # ignore everything after a # in the commandline
         [0123456Ss]) export runlevel="$cmd" ;;
         single) export runlevel="S" ;; #some people use 'single'
+        #Allow "init=X" to pass-through
+        init=*) kinit_params="${kinit_params} ${cmd}" ;;
         # replace can cause problems for the following entries
         # These should only be applied to the lefthand side of the expression
         # until we find a fix hardcode the stuff here.
diff --git a/mkinitcpio b/mkinitcpio
index f6de525..c53e57e 100644
--- a/mkinitcpio
+++ b/mkinitcpio
@@ -74,14 +74,14 @@ while getopts ':c:k:s:b:g:a:p:m:vH:LMh' arg; do
         m) MESSAGE="$OPTARG" ;;
         v) QUIET="n" ;;
         H) source "${INSTDIR}/${OPTARG}";
-           echo "Help for hook '${OPTARG}':"
-           help
-           exit 0 ;;
+        echo "Help for hook '${OPTARG}':"
+        help
+        exit 0 ;;
         L) echo "Available hooks: " 
-           for h in ${INSTDIR}/*; do
-               echo "   $(basename ${h})"
-           done
-           exit 0 ;;
+        for h in ${INSTDIR}/*; do
+            echo "   $(basename ${h})"
+        done
+        exit 0 ;;
         M) SHOW_AUTOMODS="y" ;;
         h|?) usage ;;
         :) echo "${OPTARG} requires a value..."; usage ;;
@@ -157,7 +157,7 @@ if [ -n "${BASEDIR}" ]; then
 fi
 
 if [ ! -f "${CONFIG}" ]; then
-	echo "config file '${CONFIG}' cannot be found, aborting..."
+    echo "config file '${CONFIG}' cannot be found, aborting..."
     exit 1
 fi
 source "${CONFIG}"