diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-28 08:58:12 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-02-28 08:58:12 +0100 |
| commit | 1b7510f011b5c63c060943716f39c9417b116359 (patch) | |
| tree | 51e8816a4ffb966618cc57f002de3f053085359d /scripts/install.sh | |
| parent | deab61f21e399a8b8b7e2cee42d3c3bd2136da09 (diff) | |
| parent | 4db531872ce8e489cf036526975d8f73c8b20a88 (diff) | |
Merge branch 'master' of git+ssh://wbx@openadk.org/git/openadk
Diffstat (limited to 'scripts/install.sh')
| -rwxr-xr-x | scripts/install.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/install.sh b/scripts/install.sh index a6b1ce331..bfd2ababc 100755 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -132,6 +132,15 @@ if [ $($sfdisk -l $1 2>/dev/null|grep Empty|wc -l) -ne 4 ];then fi fi +case $2 in + wrap*) + speed=38400 + ;; + *) + speed=115200 + ;; +esac + if [ $rb532 -ne 0 ];then printf "Create partition and filesystem for rb532\n" rootpart=${1}2 @@ -209,14 +218,14 @@ if [ $rb532 -eq 0 ];then cat << EOF > $tmp/boot/grub/grub.cfg set default=0 set timeout=1 -serial --unit=0 --speed=115200 +serial --unit=0 --speed=$speed terminal_output serial terminal_input serial menuentry "GNU/Linux (OpenADK)" { insmod ext2 set root=(hd0,1) - linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init console=ttyS0,115200 console=tty0 panic=10 + linux /boot/vmlinuz-adk root=/dev/sda1 ro init=/init console=ttyS0,$speed console=tty0 panic=10 } EOF chroot $tmp grub-install $1 |