diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-28 19:58:44 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2012-03-28 19:58:44 +0000 |
| commit | f4883572d8ac4b3ae6f333cf9b2604e8b56a9369 (patch) | |
| tree | 26d68cd9ca262192b235c03f093017dfe3498c0e /modules | |
| parent | 1d3c7e2a2d56d43ec15e3f30cbb5dd168578b891 (diff) | |
| download | nixpkgs-f4883572d8ac4b3ae6f333cf9b2604e8b56a9369.tar nixpkgs-f4883572d8ac4b3ae6f333cf9b2604e8b56a9369.tar.gz nixpkgs-f4883572d8ac4b3ae6f333cf9b2604e8b56a9369.tar.bz2 nixpkgs-f4883572d8ac4b3ae6f333cf9b2604e8b56a9369.tar.lz nixpkgs-f4883572d8ac4b3ae6f333cf9b2604e8b56a9369.tar.xz nixpkgs-f4883572d8ac4b3ae6f333cf9b2604e8b56a9369.tar.zst nixpkgs-f4883572d8ac4b3ae6f333cf9b2604e8b56a9369.zip | |
Making the init interactive shells handle well console kernel parameters
with extra parameters, like console=ttyS0,115200. svn path=/nixos/trunk/; revision=33458
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/system/boot/stage-1-init.sh | 4 | ||||
| -rw-r--r-- | 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 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 |