From 8d6499a1e52c5043fd2910af5d475aea00f88587 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Wed, 6 Jan 2021 20:27:20 -0500 Subject: d/install, d/p/policy.d_no_autostart.patch, d/policy-rc.d: Drop setting up policy-rc.d. This has never really worked out well. The latest rendition is fine, except if /usr/sbin/policy-rc.d doesn't exist, then it fails chroot. One could use the "ignore_error chroot_maybe_add_mount" method, but this would cause different results based on if the file exists or not, still. Seth Arnold notes that one could bind mount everything from "$1/usr/sbin/" into something like /dev/shm/installer/sbin/, then add policy-rc.d to /dev/shm/installer/sbin/, and bindmount /dev/shm/installer/sbin/ back on top of "$1/usr/sbin/policy-rc.d". --- debian/install | 1 - debian/patches/policy.d_no_autostart.patch | 21 --------------------- debian/patches/series | 1 - debian/policy-rc.d | 3 --- 4 files changed, 26 deletions(-) delete mode 100644 debian/install delete mode 100644 debian/patches/policy.d_no_autostart.patch delete mode 100755 debian/policy-rc.d (limited to 'debian') diff --git a/debian/install b/debian/install deleted file mode 100644 index 0e29011..0000000 --- a/debian/install +++ /dev/null @@ -1 +0,0 @@ -debian/policy-rc.d usr/share/arch-install-scripts/ diff --git a/debian/patches/policy.d_no_autostart.patch b/debian/patches/policy.d_no_autostart.patch deleted file mode 100644 index e748045..0000000 --- a/debian/patches/policy.d_no_autostart.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: Set up policy.d to not autostart services in the chroot -Author: Unit 193 -Forwarded: not-needed -Last-Update: 2020-12-19 - ---- - common | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/common 2020-12-19 20:05:37.304917253 -0500 -+++ b/common 2020-12-19 20:05:37.296917325 -0500 -@@ -90,7 +90,8 @@ - chroot_add_mount devpts "$1/dev/pts" -t devpts -o mode=0620,gid=5,nosuid,noexec && - chroot_add_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev && - chroot_add_mount /run "$1/run" --bind && -- chroot_add_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid -+ chroot_add_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid && -+ chroot_add_mount /usr/share/arch-install-scripts/policy-rc.d "$1/usr/sbin/policy-rc.d" --bind - } - - chroot_teardown() { diff --git a/debian/patches/series b/debian/patches/series index 6b0b6f7..5cc1400 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ include_header.patch -policy.d_no_autostart.patch diff --git a/debian/policy-rc.d b/debian/policy-rc.d deleted file mode 100755 index 105ba3d..0000000 --- a/debian/policy-rc.d +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh -# Prevent invoke-rc.d from starting services. -exit 101 -- cgit v1.2.3