git://git.onelab.eu
/
bootcd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ensure that the added kernel argument is passed to the boot image kernel as
[bootcd.git]
/
build.sh
diff --git
a/build.sh
b/build.sh
index
32f1506
..
0535962
100755
(executable)
--- a/
build.sh
+++ b/
build.sh
@@
-41,6
+41,7
@@
console_dev=""
console_baud=""
console_spec=""
console_serial_line=""
console_baud=""
console_spec=""
console_serial_line=""
+kernel_args=""
#################### compute all supported types
#################### compute all supported types
@@
-321,6
+322,7
@@
EOF
if [ -n "$KARGS_STR" ] ; then
echo "$KARGS_STR" > $OVERLAY/kargs.txt
if [ -n "$KARGS_STR" ] ; then
echo "$KARGS_STR" > $OVERLAY/kargs.txt
+ kernel_args=$KARGS_STR
fi
# Pack overlay files into a compressed archive
fi
# Pack overlay files into a compressed archive
@@
-353,7
+355,7
@@
function build_iso() {
cat >$ISOFS/isolinux.cfg <<EOF
${console_serial_line}
DEFAULT kernel
cat >$ISOFS/isolinux.cfg <<EOF
${console_serial_line}
DEFAULT kernel
-APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${
console_spec
}
+APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${
kernel_args
}
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
@@
-403,7
+405,7
@@
EOF
cat >$tmp <<EOF
${console_serial_line}
DEFAULT kernel
cat >$tmp <<EOF
${console_serial_line}
DEFAULT kernel
-APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${
console_spec
}
+APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${
kernel_args
}
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
@@
-436,7
+438,7
@@
function build_usb() {
cat >$tmp <<EOF
${console_serial_line}
DEFAULT kernel
cat >$tmp <<EOF
${console_serial_line}
DEFAULT kernel
-APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${
console_spec
}
+APPEND ramdisk_size=$ramdisk_size initrd=bootcd.img,overlay.img${custom:+,custom.img} root=/dev/ram0 rw ${
kernel_args
}
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
@@
-593,7
+595,7
@@
function build_iso_cramfs() {
cat >$tmp/isolinux.cfg <<EOF
${console_serial_line}
DEFAULT kernel
cat >$tmp/isolinux.cfg <<EOF
${console_serial_line}
DEFAULT kernel
-APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${
console_spec
}
+APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${
kernel_args
}
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
@@
-631,7
+633,7
@@
function build_usb_cramfs() {
cat >$tmp <<EOF
${console_serial_line}
DEFAULT kernel
cat >$tmp <<EOF
${console_serial_line}
DEFAULT kernel
-APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${
console_spec
}
+APPEND ramdisk_size=$cramfs_size initrd=cramfs.img root=/dev/ram0 ro ${
kernel_args
}
DISPLAY pl_version
PROMPT 0
TIMEOUT 40
DISPLAY pl_version
PROMPT 0
TIMEOUT 40