From 0cdfe6311e4e85c939ca43f2767fc2ab769bf984 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 21 Oct 2023 23:35:10 -0500
Subject: system/openrc: Don't force efivarfs to be r/o

This fixes all the stupid EFI bugs in Horizon.

Upstream: https://github.com/OpenRC/openrc/issues/238
---
 system/openrc/0006-mount-efivars-read-only.patch | 27 ------------------------
 system/openrc/APKBUILD                           |  4 +---
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 system/openrc/0006-mount-efivars-read-only.patch

(limited to 'system')

diff --git a/system/openrc/0006-mount-efivars-read-only.patch b/system/openrc/0006-mount-efivars-read-only.patch
deleted file mode 100644
index ec2321dd2..000000000
--- a/system/openrc/0006-mount-efivars-read-only.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 37feb4b716525f0c5c5469f21686ab4efcf06fab Mon Sep 17 00:00:00 2001
-From: Natanael Copa <ncopa@alpinelinux.org>
-Date: Wed, 1 Feb 2017 04:18:53 +0000
-Subject: [PATCH 6/7] mount efivars read-only
-
-unintentional writes to efivars may result in bricked hardware. mount it
-read-only to play safe.
----
- init.d/sysfs.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/init.d/sysfs.in b/init.d/sysfs.in
-index e493f584..bfd0d438 100644
---- a/init.d/sysfs.in
-+++ b/init.d/sysfs.in
-@@ -101,7 +101,7 @@ mount_misc()
- 	if [ -d /sys/firmware/efi/efivars ] &&
- 		! mountinfo -q /sys/firmware/efi/efivars; then
- 		ebegin "Mounting efivarfs filesystem"
--		mount -n -t efivarfs -o ${sysfs_opts} \
-+		mount -n -t efivarfs -o ro,${sysfs_opts} \
- 			efivarfs /sys/firmware/efi/efivars 2> /dev/null
- 		eend 0
- 	fi
--- 
-2.11.1
-
diff --git a/system/openrc/APKBUILD b/system/openrc/APKBUILD
index 5546e46be..f0ea83c39 100644
--- a/system/openrc/APKBUILD
+++ b/system/openrc/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: 
 pkgname=openrc
 pkgver=0.24.1
-pkgrel=12
+pkgrel=13
 pkgdesc="OpenRC manages the services, startup and shutdown of a host"
 url="https://github.com/OpenRC/openrc"
 arch="all"
@@ -18,7 +18,6 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/OpenRC/openrc/archive/$pkgve
 	0003-sysctl-add-compatibility-for-busybox-sysctl.patch
 	0004-hide-error-when-migrating-var-run-to-run.patch
 	0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-	0006-mount-efivars-read-only.patch
 	hwclock-grep.patch
 
 	openrc-configuration.patch
@@ -88,7 +87,6 @@ aedf77f9159fefb4bd5f30a29a33b6aedbc986c9a0f993aa928cc79fbe24aac76bd9e5974dcce52e
 5494f5ee520b26219048586882919dc0b45e839bd9543edc974f7b283d7b9326dc0362f9d2608b6acf043613399ea16c8287b854da874f49801963165e239dba  0003-sysctl-add-compatibility-for-busybox-sysctl.patch
 d54630d40a2d6b10a325cb012d4efcda997a60c008ca953ce5d60059d3f267308a59dabddf93a5fc0d301aa91967137d144effbe5f574394af768ce4ebc48738  0004-hide-error-when-migrating-var-run-to-run.patch
 39a35c54ec9112fe84c901ed155a711cec8e194af02d5483ee60b80743dab12391e6fdc7b3da2f86844dd4edcf53e681ff95bd4d6fa1101a89ce54dce2ddbb7c  0005-rc-pull-in-sysinit-and-boot-as-stacked-levels-when-n.patch
-7221dd2daccd8844f6f9481b7b5921abc2711c8abd1a4bb72f04db8fd8e734b817f5d0d571daea0e2e05d3bc687f75ee1d8025249996bdee0b3328e18d9da7d3  0006-mount-efivars-read-only.patch
 43355d72ad82858787e240450ae556cdd40aa9a3719545991d76719df80cc5c851c21374b339a6953f0344f1468e08e99c4da11334dc0b72647f4aa1db08558c  hwclock-grep.patch
 634c09a36d542a69b147a292418fa99a5d071d7a384bd2d2b30917a986cdc82ef4e96e380bc3a154cb0709c57d5308320c30fd6973972d6e6d7f8ac5b2e31bea  openrc-configuration.patch
 12bb6354e808fbf47bbab963de55ee7901738b4a912659982c57ef2777fff9a670e867fcb8ec316a76b151032c92dc89a950d7d1d835ef53f753a8f3b41d2cec  openrc.logrotate
-- 
cgit v1.2.3-60-g2f50