|
1 |
| -From d26d29a9cfea000418ea1f24127e8697af88e351 Mon Sep 17 00:00:00 2001 |
| 1 | +From 00edf67a4ec9a909919e8fa480f04c823b75ab63 Mon Sep 17 00:00:00 2001 |
2 | 2 | From: Renata Ravanelli < [email protected]>
|
3 | 3 | Date: Wed, 7 Feb 2024 16:43:54 -0300
|
4 | 4 | Subject: [PATCH 2/2] Add coreos.platforms stage
|
|
25 | 25 |
|
26 | 26 | diff --git a/stages/org.osbuild.coreos.platform b/stages/org.osbuild.coreos.platform
|
27 | 27 | new file mode 100755
|
28 |
| -index 00000000..9eceac0e |
| 28 | +index 00000000..f064fde0 |
29 | 29 | --- /dev/null
|
30 | 30 | +++ b/stages/org.osbuild.coreos.platform
|
31 | 31 | @@ -0,0 +1,115 @@
|
@@ -133,12 +133,12 @@ index 00000000..9eceac0e
|
133 | 133 | + json_grub_args, json_kargs = process_platforms_json(platforms_dest_path, platform)
|
134 | 134 | + if json_kargs:
|
135 | 135 | + kernel_arguments.extend(json_kargs)
|
136 |
| -+ |
137 | 136 | + # Write out the GRUB2 console.cfg on all platforms where grub is being used
|
138 |
| -+ if os.path.exists(os.dirname(grub_console_cfg_path)): |
| 137 | ++ if os.path.exists(os.path.dirname(grub_console_cfg_path)): |
| 138 | ++ # We add console.cfg file in grub.cfg, that's how the grubconfigs are added |
139 | 139 | + generate_console_settings_file(json_grub_args, grub_console_cfg_path)
|
140 | 140 | + # Append kernel arguments in bls entries
|
141 |
| -+ bls.options_append(f"{boot_path}", kernel_arguments) |
| 141 | ++ bls.options_append(boot_path, kernel_arguments) |
142 | 142 | +
|
143 | 143 | +if __name__ == "__main__":
|
144 | 144 | + args = osbuild.api.arguments()
|
|
0 commit comments