diff options
author | Unit 193 <unit193@ubuntu.com> | 2018-03-20 22:39:36 -0400 |
---|---|---|
committer | Unit 193 <unit193@ubuntu.com> | 2018-03-20 22:56:18 -0400 |
commit | eb818b3324b9f53e285fa30d84246dd248af8f29 (patch) | |
tree | eb2b27d7601e3b137fb7418f82d0a558ad764495 | |
parent | d929c8cbc09732337fb4805accbf3564e9cca0bb (diff) | |
download | arch-install-scripts-eb818b3324b9f53e285fa30d84246dd248af8f29.tar.bz2 arch-install-scripts-eb818b3324b9f53e285fa30d84246dd248af8f29.tar.xz arch-install-scripts-eb818b3324b9f53e285fa30d84246dd248af8f29.tar.zst |
Import Debian changes 18-1
arch-install-scripts (18-1) UNRELEASED; urgency=medium
* Initial release.
-rw-r--r-- | debian/changelog | 5 | ||||
-rw-r--r-- | debian/compat | 1 | ||||
-rw-r--r-- | debian/control | 19 | ||||
-rw-r--r-- | debian/copyright | 27 | ||||
-rw-r--r-- | debian/docs | 1 | ||||
-rw-r--r-- | debian/gbp.conf | 3 | ||||
-rw-r--r-- | debian/patches/include_header.patch | 22 | ||||
-rw-r--r-- | debian/patches/policy.d_no_autostart.patch | 42 | ||||
-rw-r--r-- | debian/patches/series | 2 | ||||
-rwxr-xr-x | debian/rules | 11 | ||||
-rw-r--r-- | debian/source/format | 1 | ||||
-rw-r--r-- | debian/upstream/signing-key.asc | 37 | ||||
-rw-r--r-- | debian/watch | 5 |
13 files changed, 176 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..d820283 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +arch-install-scripts (18-1) UNRELEASED; urgency=medium + + * Initial release. + + -- Unit 193 <unit193@ubuntu.com> Tue, 20 Mar 2018 22:39:36 -0400 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +10 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..c185ab8 --- /dev/null +++ b/debian/control @@ -0,0 +1,19 @@ +Source: arch-install-scripts +Section: admin +Priority: optional +Maintainer: Unit 193 <unit193@ubuntu.com> +Build-Depends: debhelper (>= 10), m4 +Standards-Version: 4.1.3 +Homepage: https://projects.archlinux.org/arch-install-scripts.git + +Package: arch-install-scripts +Architecture: all +Depends: ${misc:Depends} +Description: scripts aimed at automating some menial tasks when debootstrapping + A small suite of scripts aimed at automating some menial tasks when + installing Arch Linux. + . + These scripts can also aid when debootstrapping a Debian based system. + . + This package contains `genfstab` which assists with generating a fstab and `arch-chroot` + which assists with setting up bind mounts and disabling services via policy.d. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..3da8add --- /dev/null +++ b/debian/copyright @@ -0,0 +1,27 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: arch-install-scripts +Source: https://sources.archlinux.org/other/arch-install-scripts/ + +Files: * +Copyright: 2012-2018 Dave Reisner <dreisner@archlinux.org> +License: GPL-2 + +Files: debian/* +Copyright: 2015-2018 Unit 193 <unit193@ubuntu.com> +License: GPL-2 + +License: GPL-2 + This package is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License version 2 as published by + the Free Software Foundation. + . + This package is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <https://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..b43bf86 --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +README.md diff --git a/debian/gbp.conf b/debian/gbp.conf new file mode 100644 index 0000000..5474c60 --- /dev/null +++ b/debian/gbp.conf @@ -0,0 +1,3 @@ +[DEFAULT] +pristine-tar = True +sign-tags = True 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 diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..63ff2c5 --- /dev/null +++ b/debian/rules @@ -0,0 +1,11 @@ +#!/usr/bin/make -f +# See debhelper(7) (uncomment to enable) +# output every command that modifies files on the build system. +#DH_VERBOSE = 1 + +%: + dh $@ + +override_dh_auto_install: + make PREFIX=/usr DESTDIR="$(CURDIR)/debian/arch-install-scripts" install + -rm debian/arch-install-scripts/usr/bin/pacstrap diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..abcdfc1 --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,37 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQENBE4GMa8BCADKNWK/JmB7qzU3Dfw+/9iDNvGlpNvIuUuNY20RKjrS+91rdSV2 +EtrDD/1Ad55a17BdzcNcaYf1PTAljfoB0KyTYjYuyE0S9YxW0m5Em3mcp/pS68w9 +I40dlimkeIcVcod4btf1r1deJlGuyKwEj/0eqB2kxlMnZbNJKr+V/3rPyI69xX6e +Z/WIAbyNLJ31+odN08/dZRFZ3y2K8qUi4qYbPgOfE/sYEqNbdefy8YJ9NtJae4V7 +eSau90DPbwELv2WS+Ct0Gk4zm+vnmccG1A2UIdbc0zspzrHxXwlpN+wmMH79G7CZ +RhA+Fupz5lI62lSOFHIPQVNx/BaTLR3RMemfABEBAAG0H0RhdmUgUmVpc25lciA8 +ZEBmYWxjb25pbmR5LmNvbT6JATgEEwECACIFAk5bjtACGwMGCwkIBwMCBhUIAgkK +CwQWAgMBAh4BAheAAAoJEB6yY4/1bAxTVoMH/1cS/nYlfOo0C6NKCpqq1aH0d/7V +1liztNQ9ifn+oj68Gv+qOr+EdWX43CVaOMU/K+3jzpJ9tmgdZ1MIlul/cY+VI9vM ++yDvKsE5xedjMQByJPFuLJFvt3nuyBez4pNSyLg5rT7dhXzS3r1Tj+9RmhS5KXBR +suBD7x0GSaHbW1EeaD/HeV6AO8YnugHAyxQ49q6F1Ho4wpFxeORucmbxPw4PBdQf +Rh/uUaOtUwNeUzShps6YlOu6SL5DqxKIOO+a1spyLsteEEThEVpIDJzyco1m+5j7 +jcC1wSbe2MCOc8oTdqf5dkHlMOiPpQ3RM4H8zpIyNOUJXSIGvdZpHs8uUsq0JURh +dmUgUmVpc25lciA8ZHJlaXNuZXJAYXJjaGxpbnV4Lm9yZz6JATgEEwECACIFAk4G +Ma8CGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEB6yY4/1bAxTF6kIALTF +0UOC6qnOKUFaXmzMMp6jIaI/aS4wUEWC+A6z2QvgMdvrKJfpGn6zPglvU8cRMbBv +Tb2sPuyDCZIZ70ebJv1GGUhbCFHwhumzB4JDHmp8VBHOOUj86ReUN7KyqtQX3yUa +YFI/67a88k/6PWLmztJcwAsRU7FxMkw14q67k9uLq1lMfnfHjjyhH8QbQ78apEEh +4myNFi9W9LW5VgKV2dIUbaVwPxuk7UFYHmaV6ntxktT+4M2WYtjtP52c7jXXC2br +1PGjtgS7eJmODCoegKUjvuyuLR/IwNb50TkVtE3b7/RC9e2CpU6WGMbWwHUIz+Fu +yfJmC0m+TACYOg9+foq5AQ0ETgYxrwEIAK01nJUlSOJhYIMZMhff/p31uDtcMwm7 +wf3keOWioah69X6Cksdd3IYEt0Fe71ah7iWD8oqPzyDCb+hJW2wGXT+MRGgTs8iQ +yyv6VvKa67Mt9COG34ixXfIJ0y8ML337w75rk+XtcawdRiKaZJCZSRiX1wOD5uQf +3VlnGQLo8hKsTm2xwIoIOV7GQpmdeC6sjuWUR/lBCR6dl8otYvO9EwVrJTpP8yDu +44GCWZHEuFJpzxlvOCdsBYbrDI2EQKHqAzFTzqmF+nw66TMk8w+B7B5qRdWxhGdT +6r72M3zcfYq0aDv0EDzpwZ/mLAc5Vc/CcTOwm8m72vxevJ95kuMORt0AEQEAAYkB +HwQYAQIACQUCTgYxrwIbDAAKCRAesmOP9WwMU6n7CAC595OrXLWTLAOc5NmIuLd+ +lg1biDmyUQuiubXvTTjrmyAAQnUbx923gU5SxRfGfpGR8+iYOtOY9HowMgN9ct8J +/jOYdG5mGT/zAybHWBycv6+iGizsxrGxF9p+qdd7sjj0q2f8JMoSastMwTGun2xN +TgFEFjUJAPoIg3V46Pj2qPs/2KDRh89lMrN9G8MxjYyfGfh0oon2G1fsWezhG+PS +vpMALZQugEPZiwb2MTfdpHiQhrxH64RbSApVcnlNl2zjxEzmsU0416A511BOhRzp +Ww8ye1kcg4cF1Mg95G40DpH9KvuX+iNajk/dBa2k6s6/lZvWaIBmcYMYR/K5idID +=i/qC +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..383b2f1 --- /dev/null +++ b/debian/watch @@ -0,0 +1,5 @@ +# Compulsory line, this is a version 3 file +version=3 +opts=pgpsigurlmangle=s/$/.sig/ \ +https://sources.archlinux.org/other/arch-install-scripts/arch-install-scripts-(.*)\.tar\.gz + |