aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuy Martin <gmsoft@gentoo.org>2014-02-05 11:40:02 +0100
committerBrian Dolbec <dolsen@gentoo.org>2014-03-24 09:07:07 -0700
commit4a0499ea2a49536f13e9f1a40c6571ec86e3f707 (patch)
tree22bcc472b60fc69df8e7d5d886b82a046f421796
parentAllow kernelopts as a valid value for kernels. (diff)
downloadcatalyst-4a0499ea2a49536f13e9f1a40c6571ec86e3f707.tar.gz
catalyst-4a0499ea2a49536f13e9f1a40c6571ec86e3f707.tar.bz2
catalyst-4a0499ea2a49536f13e9f1a40c6571ec86e3f707.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.
-rw-r--r--targets/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 a0bc5f5..a9c9e53 100644
--- 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}