diff --git a/srcpkgs/systemd/template b/srcpkgs/systemd/template index 6a0709c17e..5946b9e344 100644 --- a/srcpkgs/systemd/template +++ b/srcpkgs/systemd/template @@ -1,7 +1,7 @@ # Template file for 'systemd' pkgname=systemd version=187 -revision=1 +revision=2 distfiles="http://www.freedesktop.org/software/$pkgname/$pkgname-$version.tar.xz" build_style=gnu-configure configure_args="--with-distro=other --libexecdir=/usr/lib @@ -9,7 +9,8 @@ configure_args="--with-distro=other --libexecdir=/usr/lib --with-sysvinit-path= --with-sysvrcd-path= --disable-audit --with-usb-ids-path=/usr/share/hwdata/usb.ids --with-pci-ids-path=/usr/share/hwdata/pci.ids" -depends="dbus run-parts kbd>=1.15.3_5 systemd-libs>=$version udev>=$version" +depends="dbus run-parts util-linux>=2.22rc1_2 kbd>=1.15.3_5 +systemd-libs>=$version udev>=$version" makedepends="pkg-config intltool gperf libxslt docbook-xsl acl-devel pam-devel dbus-devel libcap-devel libkmod-devel liblzma-devel cryptsetup-devel libblkid-devel glib-devel gobject-introspection" @@ -70,14 +71,9 @@ post_install() { for f in halt poweroff shutdown reboot; do ln -sf /usr/bin/systemctl ${DESTDIR}/usr/sbin/${f} done - # Create /sbin/init for compatibility. + # Create /usr/sbin/init for compatibility. ln -sf /usr/lib/systemd/systemd ${DESTDIR}/usr/sbin/init - # Do not use /sbin/sulogin, sysvinit has been fully removed. - for f in console-shell emergency rescue; do - sed -i -e "s|/sbin/sulogin|/bin/sh|" \ - ${DESTDIR}/usr/lib/systemd/system/${f}.service - done # Install and enable local-d.service for multi-user.target by default. vinstall ${FILESDIR}/local-d.service 644 usr/lib/systemd/system ln -sf /usr/lib/systemd/system/local-d.service \