From: Marc Fiuczynski <mef@cs.princeton.edu>
Date: Tue, 19 Feb 2008 20:31:36 +0000 (+0000)
Subject: -support so that kexec is invoked with the corrects args for serial console output
X-Git-Tag: BootCD-3.4-5~8
X-Git-Url: http://git.onelab.eu/?p=bootcd.git;a=commitdiff_plain;h=a0f0ef1af2bf76ce9a641521e6de39b77d0a0cfe

-support so that kexec is invoked with the corrects args for serial console output
---

diff --git a/build.sh b/build.sh
index 130a089..b5d6fb2 100755
--- a/build.sh
+++ b/build.sh
@@ -335,6 +335,11 @@ APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom
 DISPLAY pl_version
 PROMPT 0
 TIMEOUT 40
+EOF
+
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    cat >$isofs/kargs.txt <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}}
 EOF
 
     # Create ISO image
@@ -426,6 +431,14 @@ function build_usb()
 
     mkfs.vfat -C "$usb" $(($(du -Lsk $isofs | awk '{ print $1; }') + $FREE_SPACE))
 
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    tmp="${BUILDTMP}/kargs.txt"
+    cat >$tmp <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}
+EOF
+    mcopy -i "$usb" "$tmp" ::/kargs.txt
+    rm -f "$tmp"
+
     # Populate it
     echo -n " populating USB image... "
     mcopy -bsQ -i "$usb" "$isofs"/* ::/
@@ -615,6 +628,11 @@ APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${serial:+c
 DISPLAY pl_version
 PROMPT 0
 TIMEOUT 40
+EOF
+
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    cat >$tmp/kargs.txt <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}}
 EOF
 
     cp ${BUILDTMP}/cramfs.img $tmp
@@ -649,6 +667,14 @@ function build_usb_cramfs()
     # Make VFAT filesystem for USB
     mkfs.vfat -C "$usb" $vfat_size
 
+    # write kargs.txt with additional args that should be executed by kexec to production mode
+    tmp="${BUILDTMP}/kargs.txt"
+    cat >$tmp <<EOF
+${serial:+console=${console_dev},${console_baud}${console_parity}${console_bits}}
+EOF
+    mcopy -i "$usb" "$tmp" ::/kargs.txt
+    rm -f "$tmp"
+
     # Populate it
     echo "* Populating USB with overlay images and cramfs"
     mcopy -bsQ -i "$usb" $isofs/kernel $isofs/pl_version ::/
@@ -664,6 +690,7 @@ DISPLAY pl_version
 PROMPT 0
 TIMEOUT 40
 EOF
+
     mcopy -bsQ -i "$usb" "$tmp" ::/syslinux.cfg
     rm -f "$tmp"