From 81d9727e33826b904f741b5cf155bf21211901f3 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Tue, 23 Oct 2018 20:34:38 -0400 Subject: Refresh patches. --- debian/patches/include_header.patch | 8 +++++--- debian/patches/policy.d_no_autostart.patch | 14 +++++++++----- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/debian/patches/include_header.patch b/debian/patches/include_header.patch index a841b0f..abb62b8 100644 --- a/debian/patches/include_header.patch +++ b/debian/patches/include_header.patch @@ -2,9 +2,11 @@ Description: Include some information in the header of fstab Author: Unit 193 Last-Update: 2018-01-28 ---- arch-install-scripts-15.orig/genfstab.in -+++ arch-install-scripts-15/genfstab.in -@@ -133,6 +133,15 @@ if ! mountpoint -q "$root"; then +Index: arch-install-scripts/genfstab.in +=================================================================== +--- arch-install-scripts.orig/genfstab.in ++++ arch-install-scripts/genfstab.in +@@ -138,6 +138,15 @@ if ! mountpoint -q "$root"; then fi # handle block devices diff --git a/debian/patches/policy.d_no_autostart.patch b/debian/patches/policy.d_no_autostart.patch index 5f2c799..fb86606 100644 --- a/debian/patches/policy.d_no_autostart.patch +++ b/debian/patches/policy.d_no_autostart.patch @@ -4,9 +4,11 @@ Origin: vendor Forwarded: not-needed Last-Update: 2018-01-28 ---- arch-install-scripts-15.orig/common -+++ arch-install-scripts-15/common -@@ -74,10 +74,18 @@ chroot_maybe_add_mount() { +Index: arch-install-scripts/common +=================================================================== +--- arch-install-scripts.orig/common ++++ arch-install-scripts/common +@@ -75,10 +75,18 @@ chroot_maybe_add_mount() { fi } @@ -26,7 +28,7 @@ Last-Update: 2018-01-28 chroot_add_mount proc "$1/proc" -t proc -o nosuid,noexec,nodev && chroot_add_mount sys "$1/sys" -t sysfs -o nosuid,noexec,nodev,ro && -@@ -88,11 +96,13 @@ chroot_setup() { +@@ -89,6 +97,7 @@ chroot_setup() { chroot_add_mount shm "$1/dev/shm" -t tmpfs -o mode=1777,nosuid,nodev && chroot_add_mount run "$1/run" -t tmpfs -o nosuid,nodev,mode=0755 && chroot_add_mount tmp "$1/tmp" -t tmpfs -o mode=1777,strictatime,nodev,nosuid @@ -34,7 +36,9 @@ Last-Update: 2018-01-28 } chroot_teardown() { - umount "${CHROOT_ACTIVE_MOUNTS[@]}" +@@ -96,6 +105,7 @@ chroot_teardown() { + umount "${CHROOT_ACTIVE_MOUNTS[@]}" + fi unset CHROOT_ACTIVE_MOUNTS + rm -f "$1/usr/sbin/policy-rc.d" } -- cgit v1.2.3