aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Martin <gmsoft@gentoo.org>2014-02-05 11:40:02 +0100
committerBrian Dolbec <dolsen@gentoo.org>2015-02-26 18:03:04 -0800
commitd74ecf9effd6e5b3851ceccf3dadbef908260f2f (patch)
tree42c96c444fd7654b85fd02a86748add653a60861
parentAllow kernelopts as a valid value for kernels. (diff)
downloadcatalyst-d74ecf9effd6e5b3851ceccf3dadbef908260f2f.tar.gz
catalyst-d74ecf9effd6e5b3851ceccf3dadbef908260f2f.tar.bz2
catalyst-d74ecf9effd6e5b3851ceccf3dadbef908260f2f.zip
Make use of _kernelopts for hppa.
Since hppa only support one command line for both 32 and 64bit kernel, we merge both kernelopts in the same line. This is useful for adding extra arguments like 'panic=30' directly in the spec file. Brian Dolbec: fix whitepace error.
-rwxr-xr-xtargets/support/bootloader-setup.sh9
1 files changed, 8 insertions, 1 deletions
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh
index 857ce6f3..b76b5c47 100755
--- a/targets/support/bootloader-setup.sh
+++ b/targets/support/bootloader-setup.sh
@@ -47,7 +47,14 @@ case ${clst_hostarch} in
# Make sure we strip the extension to the kernel to allow palo to choose
boot_kernel_common_name=${first/%32/}
boot_kernel_common_name=${boot_kernel_common_name/%64/}
- echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz root=/dev/ram0 init=/linuxrc cdroot ${cmdline_opts}" >> ${icfg}
+
+ for x in ${clst_boot_kernel}
+ do
+ eval kopts=\$clst_boot_kernel_${x}_kernelopts
+ my_kopts="${my_kopts} ${kopts}"
+ done
+
+ echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line} ${my_kopts}" >> ${icfg}
echo "--bootloader=boot/iplboot" >> ${icfg}
echo "--ramdisk=boot/${first}.igz" >> ${icfg}
for x in ${clst_boot_kernel}