From f4883572d8ac4b3ae6f333cf9b2604e8b56a9369 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?=
 <viric@vicerveza.homeunix.net>
Date: Wed, 28 Mar 2012 19:58:44 +0000
Subject: [PATCH] Making the init interactive shells handle well console kernel
 parameters with extra parameters, like console=ttyS0,115200.

svn path=/nixos/trunk/; revision=33458
---
 modules/system/boot/stage-1-init.sh | 4 +++-
 modules/system/boot/stage-2-init.sh | 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index f3ad3313648e..8456e3dae157 100644
--- a/modules/system/boot/stage-1-init.sh
+++ b/modules/system/boot/stage-1-init.sh
@@ -31,7 +31,9 @@ EOF
       case $o in
         console=*)
           set -- $(IFS==; echo $o)
-          console=$2
+          params=$2
+          set -- $(IFS=,; echo $params)
+          console=$1
           ;;
       esac
     done
diff --git a/modules/system/boot/stage-2-init.sh b/modules/system/boot/stage-2-init.sh
index ccfa1d0784c7..798c4afdc385 100644
--- a/modules/system/boot/stage-2-init.sh
+++ b/modules/system/boot/stage-2-init.sh
@@ -172,7 +172,9 @@ if [ -n "$debug2" ]; then
       case $o in
         console=*)
           set -- $(IFS==; echo $o)
-          console=$2
+          params=$2
+          set -- $(IFS=,; echo $params)
+          console=$1
           ;;
       esac
     done