git://git.onelab.eu
/
bootcd.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
64c2864
)
-support so that kexec is invoked with the corrects args for serial console output
author
Marc Fiuczynski
<mef@cs.princeton.edu>
Tue, 19 Feb 2008 20:31:36 +0000
(20:31 +0000)
committer
Marc Fiuczynski
<mef@cs.princeton.edu>
Tue, 19 Feb 2008 20:31:36 +0000
(20:31 +0000)
build.sh
patch
|
blob
|
history
diff --git
a/build.sh
b/build.sh
index
130a089
..
b5d6fb2
100755
(executable)
--- 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
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
EOF
# Create ISO image
@@
-426,6
+431,14
@@
function build_usb()
mkfs.vfat -C "$usb" $(($(du -Lsk $isofs | awk '{ print $1; }') + $FREE_SPACE))
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"/* ::/
# 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
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
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
# 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 ::/
# 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
PROMPT 0
TIMEOUT 40
EOF
+
mcopy -bsQ -i "$usb" "$tmp" ::/syslinux.cfg
rm -f "$tmp"
mcopy -bsQ -i "$usb" "$tmp" ::/syslinux.cfg
rm -f "$tmp"