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