Commit 594c17f
committed
kexec: fix hybrid ISO boot from USB file
Fixes #2008 - boot hybrid ISOs (PureOS, Ubuntu, Tails,
NixOS, Kicksecure, etc.) directly from ISO file on USB without needing
to dd the ISO to a raw USB device.
Key fixes (TESTED):
- kexec-parse-boot: check_path() no longer fails on ISO-mounted files
(which exist via FUSE but not at kernel level during initrd execution)
- kexec-parse-boot: fix TAB-indented GRUB configs and leading whitespace
stripping (sed 's/^[[:space:]]*//' before extracting cmd/val)
- kexec-parse-boot: fix case \$trimcmd -> case \$cmd in syslinux_entry
(trimcmd includes full line; cmd is just the command word)
- kexec-parse-boot: strip GRUB '---' bootloader marker from append params
- kexec-parse-boot: syslinux_end handles initrd= via \${param#initrd=}
- kexec-parse-boot: fix set -e exits on normal conditions (grep -q, etc.)
- kexec-parse-bls.sh: same TAB/whitespace/trim fixes
- functions.sh: skip EFI boot configs (irrelevant on coreboot platforms)
- unpack_initramfs.sh: handle set -e exits from grep/blkid
- kexec-boot.sh: fix cmdadd append ordering in adjust_cmd_line()
- kexec-select-boot.sh: fix initrd path detection
Key fixes (UNTESTED - needs QEMU/hardware boot test):
- kexec-iso-init: inject casper-premount script into ISO initrd
(mounts ISO as loopback at /run/initramfs/iso_mount/ before casper runs)
- kexec-iso-init: fix subshell isolation via /run/initramfs/livemedia.env
(casper's run_scripts runs scripts in subshells; export doesn't propagate)
- kexec-iso-init: patch casper to source livemedia.env after premount
- kexec-iso-init: create casper-premount/ORDER so run_scripts executes script
- kexec-iso-init: pass live-media=\$MOUNTED_ISO_PATH (ISO file path)
- kexec-iso-init: pass iso-scan/auto=true
Signed-off-by: Thierry Laurion <insurgo@riseup.net>1 parent c43589f commit 594c17f
12 files changed
Lines changed: 861 additions & 342 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
118 | 118 | | |
119 | 119 | | |
120 | 120 | | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| 179 | + | |
| 180 | + | |
| 181 | + | |
| 182 | + | |
| 183 | + | |
| 184 | + | |
| 185 | + | |
| 186 | + | |
| 187 | + | |
| 188 | + | |
| 189 | + | |
| 190 | + | |
| 191 | + | |
| 192 | + | |
| 193 | + | |
| 194 | + | |
| 195 | + | |
| 196 | + | |
| 197 | + | |
| 198 | + | |
| 199 | + | |
| 200 | + | |
| 201 | + | |
| 202 | + | |
| 203 | + | |
| 204 | + | |
| 205 | + | |
| 206 | + | |
| 207 | + | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
| 212 | + | |
| 213 | + | |
121 | 214 | | |
122 | 215 | | |
123 | 216 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
104 | 104 | | |
105 | 105 | | |
106 | 106 | | |
| 107 | + | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
| 113 | + | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | + | |
| 120 | + | |
| 121 | + | |
| 122 | + | |
| 123 | + | |
| 124 | + | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
| 128 | + | |
| 129 | + | |
| 130 | + | |
| 131 | + | |
| 132 | + | |
| 133 | + | |
| 134 | + | |
| 135 | + | |
| 136 | + | |
| 137 | + | |
| 138 | + | |
| 139 | + | |
| 140 | + | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
| 144 | + | |
| 145 | + | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
| 152 | + | |
| 153 | + | |
| 154 | + | |
| 155 | + | |
| 156 | + | |
| 157 | + | |
| 158 | + | |
| 159 | + | |
| 160 | + | |
| 161 | + | |
| 162 | + | |
| 163 | + | |
| 164 | + | |
| 165 | + | |
| 166 | + | |
| 167 | + | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
| 173 | + | |
| 174 | + | |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 178 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
162 | 162 | | |
163 | 163 | | |
164 | 164 | | |
| 165 | + | |
| 166 | + | |
165 | 167 | | |
166 | 168 | | |
167 | | - | |
168 | | - | |
169 | | - | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
170 | 172 | | |
171 | 173 | | |
172 | 174 | | |
| |||
0 commit comments