| 1 |
commit: ad04eab48c96350f0866d6c1fe76f289499df21b |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Jul 29 01:10:58 2021 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 29 01:13:52 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=ad04eab4 |
| 7 |
|
| 8 |
catalyst: Remove boot/kernel/*/kernelopts support |
| 9 |
|
| 10 |
This undocumented option was only wired up for hppa, and was used by the |
| 11 |
minimal livecd to set panic=30. |
| 12 |
|
| 13 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 14 |
|
| 15 |
catalyst/base/stagebase.py | 11 ----------- |
| 16 |
targets/support/bootloader-setup.sh | 8 +------- |
| 17 |
2 files changed, 1 insertion(+), 18 deletions(-) |
| 18 |
|
| 19 |
diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py |
| 20 |
index 10cffd4c..4a1b4eb6 100644 |
| 21 |
--- a/catalyst/base/stagebase.py |
| 22 |
+++ b/catalyst/base/stagebase.py |
| 23 |
@@ -662,7 +662,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 24 |
"boot/kernel/" + x + "/gk_action", |
| 25 |
"boot/kernel/" + x + "/gk_kernargs", |
| 26 |
"boot/kernel/" + x + "/initramfs_overlay", |
| 27 |
- "boot/kernel/" + x + "/kernelopts", |
| 28 |
"boot/kernel/" + x + "/packages", |
| 29 |
"boot/kernel/" + x + "/softlevel", |
| 30 |
"boot/kernel/" + x + "/sources", |
| 31 |
@@ -1508,16 +1507,6 @@ class StageBase(TargetBase, ClearBase, GenBase): |
| 32 |
return |
| 33 |
self._copy_kernel_config(kname=kname) |
| 34 |
|
| 35 |
- # If we need to pass special options to the bootloader |
| 36 |
- # for this kernel put them into the environment |
| 37 |
- key = 'boot/kernel/' + kname + '/kernelopts' |
| 38 |
- if key in self.settings: |
| 39 |
- myopts = self.settings[key] |
| 40 |
- |
| 41 |
- if not isinstance(myopts, str): |
| 42 |
- myopts = ' '.join(myopts) |
| 43 |
- self.env[kname + "_kernelopts"] = myopts |
| 44 |
- |
| 45 |
key = 'boot/kernel/' + kname + '/extraversion' |
| 46 |
self.settings.setdefault(key, '') |
| 47 |
self.env["clst_kextraversion"] = self.settings[key] |
| 48 |
|
| 49 |
diff --git a/targets/support/bootloader-setup.sh b/targets/support/bootloader-setup.sh |
| 50 |
index a998a420..08d25b59 100755 |
| 51 |
--- a/targets/support/bootloader-setup.sh |
| 52 |
+++ b/targets/support/bootloader-setup.sh |
| 53 |
@@ -70,16 +70,10 @@ case ${clst_hostarch} in |
| 54 |
boot_kernel_common_name=${first/%32/} |
| 55 |
boot_kernel_common_name=${boot_kernel_common_name/%64/} |
| 56 |
|
| 57 |
- for x in ${clst_boot_kernel} |
| 58 |
- do |
| 59 |
- eval kopt=\$clst_boot_kernel_${x}_kernelopts |
| 60 |
- kopts+=(${kopt}) |
| 61 |
- done |
| 62 |
- |
| 63 |
# copy the bootloader for the final image |
| 64 |
cp /usr/share/palo/iplboot $1/boot/ |
| 65 |
|
| 66 |
- echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line[@]} ${kopts[@]}" >> ${icfg} |
| 67 |
+ echo "--commandline=0/${boot_kernel_common_name} initrd=${first}.igz ${default_append_line[@]}" >> ${icfg} |
| 68 |
echo "--bootloader=boot/iplboot" >> ${icfg} |
| 69 |
echo "--ramdisk=boot/${first}.igz" >> ${icfg} |
| 70 |
for x in ${clst_boot_kernel} |
Archives