From 78e3d386c125e63702ee689d8c5977abe3bc35c4 Mon Sep 17 00:00:00 2001 From: b-crumb Date: Fri, 2 Dec 2022 23:50:45 +0000 Subject: [PATCH 1/4] allow user to manually manage m1n1 updates Signed-off-by: b-crumb --- update-m1n1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/update-m1n1 b/update-m1n1 index 841b0af..feeeabf 100755 --- a/update-m1n1 +++ b/update-m1n1 @@ -5,6 +5,8 @@ set -e [ -e /etc/default/update-m1n1 ] && . /etc/default/update-m1n1 +[ $M1N1_MANAGED_MANUALLY == 1 ] && exit 0 + if [ -e "$(dirname "$0")"/functions.sh ]; then . "$(dirname "$0")"/functions.sh else From 2ff810a7fab3fe62784d034489296f2097d4e720 Mon Sep 17 00:00:00 2001 From: b-crumb Date: Wed, 21 Dec 2022 17:41:05 +0000 Subject: [PATCH 2/4] update-m1n1: simplify & rename for manual management Signed-off-by: b-crumb --- update-m1n1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update-m1n1 b/update-m1n1 index feeeabf..5267d2b 100755 --- a/update-m1n1 +++ b/update-m1n1 @@ -5,7 +5,7 @@ set -e [ -e /etc/default/update-m1n1 ] && . /etc/default/update-m1n1 -[ $M1N1_MANAGED_MANUALLY == 1 ] && exit 0 +[ -n $M1N1_UPDATE_DISABLED ] && exit 0 if [ -e "$(dirname "$0")"/functions.sh ]; then . "$(dirname "$0")"/functions.sh From 16ab02ecc2888472d60642b1729984a445f3e977 Mon Sep 17 00:00:00 2001 From: Leif Liddy Date: Tue, 17 Jan 2023 04:07:13 +0100 Subject: [PATCH 3/4] umount esp upon completion Signed-off-by: Leif Liddy --- dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh b/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh index a53d2f1..12be260 100755 --- a/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh +++ b/dracut/modules.d/99asahi-firmware/load-asahi-firmware.sh @@ -45,3 +45,4 @@ fi ( cd /; cpio --quiet -i < "$VENDORFW/firmware.cpio" ) info ":: Asahi firmware unpacked successfully" +umount /run/.system-efi From 64b58691cbd56ac42e96b31f75cd898992eace6b Mon Sep 17 00:00:00 2001 From: Toby Jones Date: Wed, 25 Jan 2023 23:43:27 +0000 Subject: [PATCH 4/4] asahi-diagnose: Use hostnamectl to fetch hostname A default installation of Asahi Linux doesn't appear to come included with the `hostname` binary. This causes the hostname lookup to fail when asahi-diagnose is used. This technically ties the script to systemd, so a better solution if this becomes a concern (i.e. if different init systems are offered in the future) might be to check for the presence of the `hostname` binary, and if it's not present, go with a sensible alternative value instead of erroring out. Signed-off-by: Toby Jones --- asahi-diagnose | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asahi-diagnose b/asahi-diagnose index 3492d3b..cb7045d 100755 --- a/asahi-diagnose +++ b/asahi-diagnose @@ -19,7 +19,7 @@ banner() { Collected at: $(date) ($(date -Iseconds)) Username: $(whoami) - Hostname: $(hostname) + Hostname: $(hostnamectl hostname) EOF }