Import Debian changes 18-1

arch-install-scripts (18-1) UNRELEASED; urgency=medium

  * Initial release.

3 files changed, 66 insertions, 0 deletions

diff --git a/debian/patches/include_header.patch b/debian/patches/include_header.patch
new file mode 100644
index 0000000..a841b0f
--- /dev/null
+++ b/debian/patches/include_header.patch
@@ -0,0 +1,22 @@
+Description: Include some information in the header of fstab
+Author: Unit 193 <unit193@ubuntu.com>
+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
+ fi
+ 
+ # handle block devices
++cat <<EOF
++# /etc/fstab: static file system information.
++#
++# Use 'blkid' to print the universally unique identifier for a
++# device; this may be used with UUID= as a more robust way to name devices
++# that works even if disks are added and removed. See fstab(5).
++#
++EOF
++printf "%-15s %-15s %-7s %-15s %-7s %s\n" '# <file system>' '<mount point>' '<type>' '<options>' '<dump>' '<pass>'
+ findmnt -Recvruno SOURCE,TARGET,FSTYPE,OPTIONS,FSROOT "$root" |
+     while read -r src target fstype opts fsroot; do
+   if (( !pseudofs )) && fstype_is_pseudofs "$fstype"; then
diff --git a/debian/patches/policy.d_no_autostart.patch b/debian/patches/policy.d_no_autostart.patch
new file mode 100644
index 0000000..5f2c799
--- /dev/null
+++ b/debian/patches/policy.d_no_autostart.patch
@@ -0,0 +1,42 @@
+Description: Setup and teardown policy.d, to not autostart applications in the chroot
+Author: Unit 193 <unit193@ubuntu.com>
+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() {
+   fi
+ }
+ 
++chroot_policyd() {
++  cat << EOF > "$1/usr/sbin/policy-rc.d"
++#!/bin/sh
++exit 101
++EOF
++  chmod +x "$1/usr/sbin/policy-rc.d"
++}
++
+ chroot_setup() {
+   CHROOT_ACTIVE_MOUNTS=()
+   [[ $(trap -p EXIT) ]] && die '(BUG): attempting to overwrite existing EXIT trap'
+-  trap 'chroot_teardown' EXIT
++  trap "chroot_teardown $1" EXIT
+ 
+   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() {
+   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
++  chroot_policyd "$1"
+ }
+ 
+ chroot_teardown() {
+   umount "${CHROOT_ACTIVE_MOUNTS[@]}"
+   unset CHROOT_ACTIVE_MOUNTS
++  rm -f "$1/usr/sbin/policy-rc.d"
+ }
+ 
+ try_cast() (
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..6b0b6f7
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+include_header.patch
+policy.d_no_autostart.patch