diff --git a/modules/system/boot/stage-1-init.sh b/modules/system/boot/stage-1-init.sh
index f3ad3313648..8456e3dae15 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 ccfa1d0784c..798c4afdc38 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