Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Arch iso boot fixup (kexec-parse-boot and kexec-boot-iso fixups) #1120

Merged
merged 3 commits into from
Mar 8, 2022
Merged

Arch iso boot fixup (kexec-parse-boot and kexec-boot-iso fixups) #1120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6769c38
Tweak syslinux parsing code to be compatible with new Arch isos
Jun 26, 2020
e70e9c2
distro key: addition of arch minimized public key
tlaurion Feb 21, 2022
1809b3b
bin/kexec-iso-init: Add support for Arch iso support requirements (fo…
tlaurion Feb 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion initrd/bin/kexec-iso-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mount -t iso9660 -o loop $MOUNTED_ISO_PATH /boot \
|| die '$MOUNTED_ISO_PATH: Unable to mount /boot'

DEV_UUID=`blkid $DEV | tail -1 | tr " " "\n" | grep UUID | cut -d\" -f2`
ADD="fromiso=/dev/disk/by-uuid/$DEV_UUID/$ISO_PATH iso-scan/filename=/${ISO_PATH}"
ADD="fromiso=/dev/disk/by-uuid/$DEV_UUID/$ISO_PATH img_dev=/dev/disk/by-uuid/$DEV_UUID iso-scan/filename=/${ISO_PATH} img_loop=$ISO_PATH"
REMOVE=""

paramsdir="/media/kexec_iso/$ISO_PATH"
Expand Down
7 changes: 5 additions & 2 deletions initrd/bin/kexec-parse-boot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ echo_entry() {
fix_path $kernel
entry="$name|$kexectype|kernel $path"
if [ -n "$initrd" ]; then
fix_path $initrd
entry="$entry|initrd $path"
for init in $(echo $initrd | tr ',' ' '); do
fix_path $init
entry="$entry|initrd $path"
done
fi
if [ -n "$append" ]; then
entry="$entry|append $append"
Expand Down Expand Up @@ -118,6 +120,7 @@ syslinux_end() {
append="${newappend##' '}"
fi

appenddir="$(echo $appenddir | cut -d\/ -f -2)"
echo_entry
state="search"
}
Expand Down
30 changes: 30 additions & 0 deletions initrd/etc/distro/keys/archlinux.key
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
-----BEGIN PGP PUBLIC KEY BLOCK-----

mQENBE2heeUBCADDi8aOa7BFXWVCO/Ygol5pHptu1I9Cndg7OLj4enLeSoRFBgc2
pOrIu8beFMeEVRWq8DsIgS6s2tSp+booatUyw6wMTLp59SNJsuHwJM5JfLtOlvP2
0hTBpy72HaBo16t2xfqZnboq9Zb4kGKhvGnakQXsbJLnth6Ln0Z3ykJtO9JrOb0a
pu86N+EHKrYH/ir/grcn5or6yJUTYDNvvFVWmP99yNhXp8Y1c8FozmQo0wEhWq+O
AM010hDVmU1WjpsSJR5XQuKEgxJoxKl5bltcnzJnB1tquFRLFggWOzWi4Hf20V4w
d7uMG8S7hgK70CHtznOAsDcL3LcvTeSIvGF3ABEBAAG0JFBpZXJyZSBTY2htaXR6
IDxwaWVycmVAYXJjaGxpbnV4LmRlPokBUgQTAQgAPAIbAwYLCQgHAwIGFQgCCQoL
BBYCAwECHgECF4AWIQRKpHZ7vJxLHRiuKLd/LUNLl0HorAUCYX6nZQIZAQAKCRB/
LUNLl0HorNKAB/91+uRNJaohO5mun3qJpicRNdyECoCyZJfxGl+t841fTaOK+STJ
afgMnsYkkoE87rBbh45wtOPFMofo7ckaB8ELl8t+nAndCijjadM3Ro9Bjin2/hyS
Y4Xb4v2e+x45qE3Lj81uYknHPJggYwap5hTkya4N6cZuh1+zZy0rGdm7/UdgS84r
BnfyamEeuynjiLCP1BXEOu7Zx7k6djjfry08rd+qyWwUJQ7wfUZ0UjmjtVDlSPHj
4+XMx85fvtOISpy4A6bAX7kJTc0sOTGb0dC9rsSKwb6/R23yv5Llt5FDoclV9zMC
30PALSu7A80TQ+pxaxidruovwHjHsAa/q1xnuQENBE2heeUBCADDxPCizcrOhH12
RbIk8enSsrbATbQnSgpU3DHF76j2gVItsBzpfjYgQCeD5KasXuFmFFph2pY73qCu
oDQxFTo4gJNZt90/oV7C/vPEwMY5MkHdK2bB3BlZznshkpHNmWRBKvCrHJ09jZxm
CICeNymhMyAYBGWM7MTCzEsKk9CuplxF5QApCbWwtlZVpgxra90MzBVlQT+ErXiL
lXt8RG673RlGeFpOdxWK4USbr1AvqYxMV6Y4s/mKpcAJQBdL5IeRT8BnaG5mVjS0
UgN8MeN6c+NlvfnFBZF9XFZXfFJ1QrDaneyT181guKB4apxmvtyXxD9OYdW/EXGb
GpdbF3OxABEBAAGJAR8EGAECAAkFAk2heeUCGwwACgkQfy1DS5dB6Ky85gf9HtPM
snJIqizJd5s2oRkpYxPiyLKpq+0lH2R+yPo1Qyt7zpR1SV8iSVDaTiaxfF4BwZQz
0Qt0FnIprzWuIw2FjElE/tVFH+Fw9SW5t31ly+v/jXa+iGcMXIblDX5I0gqffXVJ
RGzZzPQDV0Yv4zyP/2Hsv0F250N2N8/cZqPaX5J0dKrOhDmi5yc5WoYJzzZVzXRu
XwzCncn0ymZteOGwcaW4kmaTQPb33idmTE89pXnskgQFpftAdvPw9Qf/zjVhTtFX
95wtoNPcYOtMIARp/OejazBHaRW+NIWyCvj78MRoy9s0TOAzwcyOCWpjzHuPvslg
/U0HErbDGhNsa8/dnA==
=blHs
-----END PGP PUBLIC KEY BLOCK-----