summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-06-27 12:07:40 -0300
committerAndré Fabian Silva Delgado <emulatorman@parabola.nu>2016-06-27 12:13:14 -0300
commitf81e72b38c588164ec8da03e028a7e2d1e27001d (patch)
treedb88bcafb550d5831ce46fd4eafeac7a86925a03
parent27332eca9590c5c39e43780d21b5fe998a586a25 (diff)
downloadabslibre-f81e72b38c588164ec8da03e028a7e2d1e27001d.tar.gz
abslibre-f81e72b38c588164ec8da03e028a7e2d1e27001d.tar.bz2
abslibre-f81e72b38c588164ec8da03e028a7e2d1e27001d.zip
systemd-knock-230-5: bump to Arch's revision
* backport fix for ipv6 gateway autoconfiguration - FS#47572 -> https://bugs.archlinux.org/task/47572 * add rescue/emergency targets and needed machinery - FS#36265 -> https://bugs.archlinux.org/task/36265
-rw-r--r--pcr/systemd-knock/PKGBUILD8
-rw-r--r--pcr/systemd-knock/initcpio-install-systemd14
2 files changed, 16 insertions, 6 deletions
diff --git a/pcr/systemd-knock/PKGBUILD b/pcr/systemd-knock/PKGBUILD
index 961d250ac..86ea92faa 100644
--- a/pcr/systemd-knock/PKGBUILD
+++ b/pcr/systemd-knock/PKGBUILD
@@ -9,7 +9,7 @@ pkgbase=systemd-knock
pkgname=('systemd-knock' 'libsystemd-knock' 'systemd-knock-sysvcompat'
'libsystemd-knock-standalone' 'libudev-knock' 'nss-knock-myhostname' 'nss-knock-mymachines' 'nss-knock-resolve')
pkgver=230
-pkgrel=4.2
+pkgrel=5
arch=('i686' 'x86_64' 'armv7h')
url="http://www.freedesktop.org/wiki/Software/systemd"
makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf'
@@ -72,6 +72,12 @@ _backports=(
# automount: handle expire_tokens when the mount unit changes its state (#3434)
0a62f81045dd810c8f1223cccbac4d706ea2cb45
+
+ # networkd: networkd: ndisc set SO_BINDTODEVICE on socket (#3294)
+ 15fec93be37f12ef6c36a3e8f7dbb1984e1bcfe7
+
+ # resolved: when restarting a transaction make sure to not touch it anymore (#3553)
+ 5278bbfe0c79c1f2b5bf8a215d8e7d63f1900ce9
)
prepare() {
diff --git a/pcr/systemd-knock/initcpio-install-systemd b/pcr/systemd-knock/initcpio-install-systemd
index 96df98ada..30b542570 100644
--- a/pcr/systemd-knock/initcpio-install-systemd
+++ b/pcr/systemd-knock/initcpio-install-systemd
@@ -100,6 +100,7 @@ build() {
add_binary /bin/mount
add_binary /usr/bin/kmod /usr/bin/modprobe
add_binary /usr/lib/systemd/systemd /init
+ add_binary /usr/bin/sulogin
map add_binary \
/usr/bin/systemd-tmpfiles \
@@ -108,8 +109,6 @@ build() {
/usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
- add_module "kdbus?"
-
# udev rules and systemd units
map add_udev_rule "$rules" \
50-udev-default.rules \
@@ -123,6 +122,7 @@ build() {
initrd-fs.target \
initrd-parse-etc.service \
initrd-root-fs.target \
+ initrd-root-device.target \
initrd-switch-root.service \
initrd-switch-root.target \
initrd-udevadm-cleanup-db.service \
@@ -145,7 +145,9 @@ build() {
systemd-udevd-control.socket \
systemd-udevd-kernel.socket \
systemd-udevd.service \
- timers.target
+ timers.target \
+ rescue.target \
+ emergency.target
add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
@@ -153,8 +155,10 @@ build() {
# udev wants /etc/group since it doesn't launch with --resolve-names=never
add_file "/etc/nsswitch.conf"
add_binary "$(readlink -f /usr/lib/libnss_files.so)"
- add_file "/etc/passwd"
- add_file "/etc/group"
+
+ echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
+ echo "root:x:0:root" >"$BUILDROOT/etc/group"
+ echo "root::::::::" >"$BUILDROOT/etc/shadow"
}
help() {