diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-06-27 12:04:55 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2016-06-27 12:13:14 -0300 |
| commit | 27332eca9590c5c39e43780d21b5fe998a586a25 (patch) | |
| tree | 78852ad3dd477cd09c3bf03cca9211a686c36879 | |
| parent | d3bead6e6ee8703915dcc7c501fd3e198899ba5c (diff) | |
systemd-230-5.parabola1: 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-- | libre/systemd/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/systemd/initcpio-install-systemd | 11 |
2 files changed, 15 insertions, 4 deletions
diff --git a/libre/systemd/PKGBUILD b/libre/systemd/PKGBUILD index ac6cabff2..5ca7de149 100644 --- a/libre/systemd/PKGBUILD +++ b/libre/systemd/PKGBUILD @@ -7,7 +7,7 @@ pkgbase=systemd pkgname=('systemd' 'libsystemd' 'systemd-sysvcompat' 'libsystemd-standalone' 'libudev' 'nss-myhostname' 'nss-mymachines' 'nss-resolve') pkgver=230 -pkgrel=4.parabola2 +pkgrel=5.parabola1 arch=('i686' 'x86_64' 'armv7h') url="http://www.freedesktop.org/wiki/Software/systemd" makedepends=('acl' 'cryptsetup' 'docbook-xsl' 'gperf' 'lz4' 'xz' 'pam' 'libelf' @@ -60,6 +60,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/libre/systemd/initcpio-install-systemd b/libre/systemd/initcpio-install-systemd index d8d30aa3d..30b542570 100644 --- a/libre/systemd/initcpio-install-systemd +++ b/libre/systemd/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 \ @@ -144,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" @@ -152,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() { |