[arch-commits] Commit in systemd/repos (14 files)
Dave Reisner
dreisner at archlinux.org
Tue Feb 7 03:51:51 UTC 2012
Date: Monday, February 6, 2012 @ 22:51:50
Author: dreisner
Revision: 149354
archrelease: copy trunk to testing-i686, testing-x86_64
Added:
systemd/repos/testing-i686/PKGBUILD
(from rev 149353, systemd/trunk/PKGBUILD)
systemd/repos/testing-i686/os-release
(from rev 149353, systemd/trunk/os-release)
systemd/repos/testing-i686/systemd.install
(from rev 149353, systemd/trunk/systemd.install)
systemd/repos/testing-x86_64/PKGBUILD
(from rev 149353, systemd/trunk/PKGBUILD)
systemd/repos/testing-x86_64/os-release
(from rev 149353, systemd/trunk/os-release)
systemd/repos/testing-x86_64/systemd.install
(from rev 149353, systemd/trunk/systemd.install)
Deleted:
systemd/repos/testing-i686/0001-mount-fix-automount-regression.patch
systemd/repos/testing-i686/PKGBUILD
systemd/repos/testing-i686/os-release
systemd/repos/testing-i686/systemd.install
systemd/repos/testing-x86_64/0001-mount-fix-automount-regression.patch
systemd/repos/testing-x86_64/PKGBUILD
systemd/repos/testing-x86_64/os-release
systemd/repos/testing-x86_64/systemd.install
----------------------------------------------------------+
testing-i686/0001-mount-fix-automount-regression.patch | 45 ---
testing-i686/PKGBUILD | 170 ++++++-------
testing-i686/os-release | 10
testing-i686/systemd.install | 106 ++++----
testing-x86_64/0001-mount-fix-automount-regression.patch | 45 ---
testing-x86_64/PKGBUILD | 170 ++++++-------
testing-x86_64/os-release | 10
testing-x86_64/systemd.install | 106 ++++----
8 files changed, 282 insertions(+), 380 deletions(-)
Deleted: testing-i686/0001-mount-fix-automount-regression.patch
===================================================================
--- testing-i686/0001-mount-fix-automount-regression.patch 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-i686/0001-mount-fix-automount-regression.patch 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,45 +0,0 @@
-From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt at redhat.com>
-Date: Thu, 26 Jan 2012 01:19:19 +0100
-Subject: [PATCH] mount: fix automount regression
-
-Tom Gundersen noticed a regression where comment=systemd.automount in
-fstab no longer prevented the adding of the After=foo.mount dependency
-into local-fs.target. He bisected it to commit 9ddc4a26.
-
-It turns out that clearing the default_dependencies flag is necessary
-after all, in order to avoid complementing of Wants= with After= in the
-target unit. We still want to add the dependencies on quota units and
-umount.target though.
----
- src/mount.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/src/mount.c b/src/mount.c
-index 6d0af4e..965f705 100644
---- a/src/mount.c
-+++ b/src/mount.c
-@@ -583,6 +583,11 @@ static int mount_load(Unit *u) {
-
- if (UNIT(m)->fragment_path)
- m->from_fragment = true;
-+ else if (m->from_etc_fstab)
-+ /* We always add several default dependencies to fstab mounts,
-+ * but we do not want the implicit complementing of Wants= with After=
-+ * in the target unit that this mount unit will be hooked into. */
-+ UNIT(m)->default_dependencies = false;
-
- if (!m->where)
- if (!(m->where = unit_name_to_path(u->id)))
-@@ -615,7 +620,7 @@ static int mount_load(Unit *u) {
- if ((r = mount_add_fstab_links(m)) < 0)
- return r;
-
-- if (UNIT(m)->default_dependencies)
-+ if (UNIT(m)->default_dependencies || m->from_etc_fstab)
- if ((r = mount_add_default_dependencies(m)) < 0)
- return r;
-
---
-1.7.8.4
-
Deleted: testing-i686/PKGBUILD
===================================================================
--- testing-i686/PKGBUILD 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-i686/PKGBUILD 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=systemd
-pkgver=39
-pkgrel=2
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
-makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
- 'dbus-python: systemd-analyze'
- 'initscripts: legacy support for hostname and vconsole setup'
- 'initscripts-systemd: native boot and initialization scripts'
- 'python2-cairo: systemd-analyze'
- 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-options=('!libtool')
-backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
- etc/dbus-1/system.d/org.freedesktop.hostname1.conf
- etc/dbus-1/system.d/org.freedesktop.login1.conf
- etc/dbus-1/system.d/org.freedesktop.locale1.conf
- etc/dbus-1/system.d/org.freedesktop.timedate1.conf
- etc/systemd/system.conf
- etc/systemd/user.conf
- etc/systemd/systemd-logind.conf)
-install=systemd.install
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
- "os-release"
- "0001-mount-fix-automount-regression.patch")
-md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
- '752636def0db3c03f121f8b4f44a63cd'
- '6e42637c1b1d4589909329dab777631b')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # Don't unset locale in getty
- # https://bugzilla.redhat.com/show_bug.cgi?id=663900
- sed -i -e '/^Environ.*LANG/s/^/#/' \
- -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
-
- # fix default dependencies for automounts in /etc/fstab
- patch -Np1 < "$srcdir/0001-mount-fix-automount-regression.patch"
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --libdir=/usr/lib \
- --localstatedir=/var \
- --with-rootprefix= \
- --with-rootlibdir=/lib
-
- make
-
- # fix .so links in manpages
- sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
- sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # needed by systemd-loginctl for enable-linger
- install -dm755 "$pkgdir/var/lib/systemd"
-
- install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
- printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
- # fix systemd-analyze for python2
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
- # rename man pages to avoid conflicts with sysvinit and initscripts
- cd "$pkgdir/usr/share/man"
-
- manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
- man5/{hostname,{vconsole,locale}.conf}.5)
-
- for manpage in "${manpages[@]}"; do
- IFS='/' read section page <<< "$manpage"
- mv "$manpage" "$section/systemd.$page"
- done
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/testing-i686/PKGBUILD (from rev 149353, systemd/trunk/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD (rev 0)
+++ testing-i686/PKGBUILD 2012-02-07 03:51:50 UTC (rev 149354)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=systemd
+pkgver=40
+pkgrel=1
+pkgdesc="Session and Startup manager"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
+makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
+optdepends=('cryptsetup: required for encrypted block devices'
+ 'dbus-python: systemd-analyze'
+ 'initscripts: legacy support for hostname and vconsole setup'
+ 'initscripts-systemd: native boot and initialization scripts'
+ 'python2-cairo: systemd-analyze'
+ 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
+options=('!libtool')
+backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+ etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+ etc/dbus-1/system.d/org.freedesktop.login1.conf
+ etc/dbus-1/system.d/org.freedesktop.locale1.conf
+ etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/systemd/system.conf
+ etc/systemd/user.conf
+ etc/systemd/systemd-logind.conf
+ etc/systemd/systemd-journald.conf)
+install=systemd.install
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+ "os-release")
+md5sums=('8880180f54dac8618ef70c46492fd8d9'
+ '752636def0db3c03f121f8b4f44a63cd')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Don't unset locale in getty
+ # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+ sed -i -e '/^Environ.*LANG/s/^/#/' \
+ -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
+
+ ./configure --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --libdir=/usr/lib \
+ --localstatedir=/var \
+ --with-rootprefix= \
+ --with-rootlibdir=/lib
+
+ make
+
+ # fix .so links in manpages
+ sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
+ sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # needed by systemd-loginctl for enable-linger
+ install -dm755 "$pkgdir/var/lib/systemd"
+
+ install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+ printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+ # fix systemd-analyze for python2
+ sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+ # rename man pages to avoid conflicts with sysvinit and initscripts
+ cd "$pkgdir/usr/share/man"
+
+ manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+ man5/{hostname,{vconsole,locale}.conf}.5)
+
+ for manpage in "${manpages[@]}"; do
+ IFS='/' read section page <<< "$manpage"
+ mv "$manpage" "$section/systemd.$page"
+ done
+}
+
+# vim: ft=sh syn=sh et
Deleted: testing-i686/os-release
===================================================================
--- testing-i686/os-release 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-i686/os-release 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
Copied: systemd/repos/testing-i686/os-release (from rev 149353, systemd/trunk/os-release)
===================================================================
--- testing-i686/os-release (rev 0)
+++ testing-i686/os-release 2012-02-07 03:51:50 UTC (rev 149354)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
Deleted: testing-i686/systemd.install
===================================================================
--- testing-i686/systemd.install 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-i686/systemd.install 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
- if ! getent group lock >/dev/null; then
- groupadd -g 54 lock
- fi
-}
-
-sd_booted() {
- [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- echo "systemd has been installed to /bin/systemd. Please ensure you append"
- echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- if sd_booted; then
- systemctl daemon-reexec >/dev/null
- fi
-
- newpkgver=${1%-*}
- oldpkgver=${2%-*}
-
- # catch v31 need for restarting systemd-logind.service
- if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
- # but only if systemd is running
- if sd_booted; then
- systemctl try-restart systemd-logind.service
- fi
- fi
-}
-
-post_remove() {
- if getent group lock >/dev/null; then
- groupdel lock
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-i686/systemd.install (from rev 149353, systemd/trunk/systemd.install)
===================================================================
--- testing-i686/systemd.install (rev 0)
+++ testing-i686/systemd.install 2012-02-07 03:51:50 UTC (rev 149354)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+ if ! getent group lock >/dev/null; then
+ groupadd -g 54 lock
+ fi
+}
+
+sd_booted() {
+ [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ echo "systemd has been installed to /bin/systemd. Please ensure you append"
+ echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ if sd_booted; then
+ systemctl daemon-reexec >/dev/null
+ fi
+
+ newpkgver=${1%-*}
+ oldpkgver=${2%-*}
+
+ # catch v31 need for restarting systemd-logind.service
+ if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+ # but only if systemd is running
+ if sd_booted; then
+ systemctl try-restart systemd-logind.service
+ fi
+ fi
+}
+
+post_remove() {
+ if getent group lock >/dev/null; then
+ groupdel lock
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: testing-x86_64/0001-mount-fix-automount-regression.patch
===================================================================
--- testing-x86_64/0001-mount-fix-automount-regression.patch 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-x86_64/0001-mount-fix-automount-regression.patch 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,45 +0,0 @@
-From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt at redhat.com>
-Date: Thu, 26 Jan 2012 01:19:19 +0100
-Subject: [PATCH] mount: fix automount regression
-
-Tom Gundersen noticed a regression where comment=systemd.automount in
-fstab no longer prevented the adding of the After=foo.mount dependency
-into local-fs.target. He bisected it to commit 9ddc4a26.
-
-It turns out that clearing the default_dependencies flag is necessary
-after all, in order to avoid complementing of Wants= with After= in the
-target unit. We still want to add the dependencies on quota units and
-umount.target though.
----
- src/mount.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletions(-)
-
-diff --git a/src/mount.c b/src/mount.c
-index 6d0af4e..965f705 100644
---- a/src/mount.c
-+++ b/src/mount.c
-@@ -583,6 +583,11 @@ static int mount_load(Unit *u) {
-
- if (UNIT(m)->fragment_path)
- m->from_fragment = true;
-+ else if (m->from_etc_fstab)
-+ /* We always add several default dependencies to fstab mounts,
-+ * but we do not want the implicit complementing of Wants= with After=
-+ * in the target unit that this mount unit will be hooked into. */
-+ UNIT(m)->default_dependencies = false;
-
- if (!m->where)
- if (!(m->where = unit_name_to_path(u->id)))
-@@ -615,7 +620,7 @@ static int mount_load(Unit *u) {
- if ((r = mount_add_fstab_links(m)) < 0)
- return r;
-
-- if (UNIT(m)->default_dependencies)
-+ if (UNIT(m)->default_dependencies || m->from_etc_fstab)
- if ((r = mount_add_default_dependencies(m)) < 0)
- return r;
-
---
-1.7.8.4
-
Deleted: testing-x86_64/PKGBUILD
===================================================================
--- testing-x86_64/PKGBUILD 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-x86_64/PKGBUILD 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,87 +0,0 @@
-# $Id$
-# Maintainer: Dave Reisner <dreisner at archlinux.org>
-
-pkgname=systemd
-pkgver=39
-pkgrel=2
-pkgdesc="Session and Startup manager"
-arch=('i686' 'x86_64')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2')
-depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
-makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
-optdepends=('cryptsetup: required for encrypted block devices'
- 'dbus-python: systemd-analyze'
- 'initscripts: legacy support for hostname and vconsole setup'
- 'initscripts-systemd: native boot and initialization scripts'
- 'python2-cairo: systemd-analyze'
- 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
-options=('!libtool')
-backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
- etc/dbus-1/system.d/org.freedesktop.hostname1.conf
- etc/dbus-1/system.d/org.freedesktop.login1.conf
- etc/dbus-1/system.d/org.freedesktop.locale1.conf
- etc/dbus-1/system.d/org.freedesktop.timedate1.conf
- etc/systemd/system.conf
- etc/systemd/user.conf
- etc/systemd/systemd-logind.conf)
-install=systemd.install
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
- "os-release"
- "0001-mount-fix-automount-regression.patch")
-md5sums=('7179b34f6f6553d2a36551ac1dec5f0d'
- '752636def0db3c03f121f8b4f44a63cd'
- '6e42637c1b1d4589909329dab777631b')
-
-build() {
- cd "$pkgname-$pkgver"
-
- # Don't unset locale in getty
- # https://bugzilla.redhat.com/show_bug.cgi?id=663900
- sed -i -e '/^Environ.*LANG/s/^/#/' \
- -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
-
- # fix default dependencies for automounts in /etc/fstab
- patch -Np1 < "$srcdir/0001-mount-fix-automount-regression.patch"
-
- ./configure --sysconfdir=/etc \
- --libexecdir=/usr/lib \
- --libdir=/usr/lib \
- --localstatedir=/var \
- --with-rootprefix= \
- --with-rootlibdir=/lib
-
- make
-
- # fix .so links in manpages
- sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
- sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
-}
-
-package() {
- cd "$pkgname-$pkgver"
-
- make DESTDIR="$pkgdir" install
-
- # needed by systemd-loginctl for enable-linger
- install -dm755 "$pkgdir/var/lib/systemd"
-
- install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
- printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
- # fix systemd-analyze for python2
- sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
- # rename man pages to avoid conflicts with sysvinit and initscripts
- cd "$pkgdir/usr/share/man"
-
- manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
- man5/{hostname,{vconsole,locale}.conf}.5)
-
- for manpage in "${manpages[@]}"; do
- IFS='/' read section page <<< "$manpage"
- mv "$manpage" "$section/systemd.$page"
- done
-}
-
-# vim: ft=sh syn=sh et
Copied: systemd/repos/testing-x86_64/PKGBUILD (from rev 149353, systemd/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD (rev 0)
+++ testing-x86_64/PKGBUILD 2012-02-07 03:51:50 UTC (rev 149354)
@@ -0,0 +1,83 @@
+# $Id$
+# Maintainer: Dave Reisner <dreisner at archlinux.org>
+
+pkgname=systemd
+pkgver=40
+pkgrel=1
+pkgdesc="Session and Startup manager"
+arch=('i686' 'x86_64')
+url="http://www.freedesktop.org/wiki/Software/systemd"
+license=('GPL2')
+depends=('acl' 'dbus-core' 'kbd' 'libcap' 'util-linux>=2.19' 'udev>=172' 'xz')
+makedepends=('gperf' 'cryptsetup' 'intltool' 'linux-api-headers')
+optdepends=('cryptsetup: required for encrypted block devices'
+ 'dbus-python: systemd-analyze'
+ 'initscripts: legacy support for hostname and vconsole setup'
+ 'initscripts-systemd: native boot and initialization scripts'
+ 'python2-cairo: systemd-analyze'
+ 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts')
+options=('!libtool')
+backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
+ etc/dbus-1/system.d/org.freedesktop.hostname1.conf
+ etc/dbus-1/system.d/org.freedesktop.login1.conf
+ etc/dbus-1/system.d/org.freedesktop.locale1.conf
+ etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/systemd/system.conf
+ etc/systemd/user.conf
+ etc/systemd/systemd-logind.conf
+ etc/systemd/systemd-journald.conf)
+install=systemd.install
+source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
+ "os-release")
+md5sums=('8880180f54dac8618ef70c46492fd8d9'
+ '752636def0db3c03f121f8b4f44a63cd')
+
+build() {
+ cd "$pkgname-$pkgver"
+
+ # Don't unset locale in getty
+ # https://bugzilla.redhat.com/show_bug.cgi?id=663900
+ sed -i -e '/^Environ.*LANG/s/^/#/' \
+ -e '/^ExecStart/s/agetty/& -8/' units/getty at .service.m4
+
+ ./configure --sysconfdir=/etc \
+ --libexecdir=/usr/lib \
+ --libdir=/usr/lib \
+ --localstatedir=/var \
+ --with-rootprefix= \
+ --with-rootlibdir=/lib
+
+ make
+
+ # fix .so links in manpages
+ sed -i 's|\.so halt\.8|.so man8/systemd.halt.8|' man/{halt,poweroff}.8
+ sed -i 's|\.so systemd\.1|.so man1/systemd.1|' man/init.1
+}
+
+package() {
+ cd "$pkgname-$pkgver"
+
+ make DESTDIR="$pkgdir" install
+
+ # needed by systemd-loginctl for enable-linger
+ install -dm755 "$pkgdir/var/lib/systemd"
+
+ install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
+ printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
+
+ # fix systemd-analyze for python2
+ sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
+ # rename man pages to avoid conflicts with sysvinit and initscripts
+ cd "$pkgdir/usr/share/man"
+
+ manpages=(man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8
+ man5/{hostname,{vconsole,locale}.conf}.5)
+
+ for manpage in "${manpages[@]}"; do
+ IFS='/' read section page <<< "$manpage"
+ mv "$manpage" "$section/systemd.$page"
+ done
+}
+
+# vim: ft=sh syn=sh et
Deleted: testing-x86_64/os-release
===================================================================
--- testing-x86_64/os-release 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-x86_64/os-release 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
Copied: systemd/repos/testing-x86_64/os-release (from rev 149353, systemd/trunk/os-release)
===================================================================
--- testing-x86_64/os-release (rev 0)
+++ testing-x86_64/os-release 2012-02-07 03:51:50 UTC (rev 149354)
@@ -0,0 +1,5 @@
+NAME="Arch Linux"
+ID=arch
+PRETTY_NAME="Arch Linux"
+ANSI_COLOR="1;36"
+
Deleted: testing-x86_64/systemd.install
===================================================================
--- testing-x86_64/systemd.install 2012-02-07 03:51:35 UTC (rev 149353)
+++ testing-x86_64/systemd.install 2012-02-07 03:51:50 UTC (rev 149354)
@@ -1,53 +0,0 @@
-#!/bin/sh
-
-checkgroups() {
- if ! getent group lock >/dev/null; then
- groupadd -g 54 lock
- fi
-}
-
-sd_booted() {
- [ -e sys/fs/cgroups/systemd ]
-}
-
-post_install() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- echo "systemd has been installed to /bin/systemd. Please ensure you append"
- echo "init=/bin/systemd to your kernel command line in your bootloader."
-}
-
-post_upgrade() {
- checkgroups
-
- if [ ! -f etc/machine-id ]; then
- systemd-machine-id-setup
- fi
-
- if sd_booted; then
- systemctl daemon-reexec >/dev/null
- fi
-
- newpkgver=${1%-*}
- oldpkgver=${2%-*}
-
- # catch v31 need for restarting systemd-logind.service
- if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
- # but only if systemd is running
- if sd_booted; then
- systemctl try-restart systemd-logind.service
- fi
- fi
-}
-
-post_remove() {
- if getent group lock >/dev/null; then
- groupdel lock
- fi
-}
-
-# vim:set ts=2 sw=2 et:
Copied: systemd/repos/testing-x86_64/systemd.install (from rev 149353, systemd/trunk/systemd.install)
===================================================================
--- testing-x86_64/systemd.install (rev 0)
+++ testing-x86_64/systemd.install 2012-02-07 03:51:50 UTC (rev 149354)
@@ -0,0 +1,53 @@
+#!/bin/sh
+
+checkgroups() {
+ if ! getent group lock >/dev/null; then
+ groupadd -g 54 lock
+ fi
+}
+
+sd_booted() {
+ [ -e sys/fs/cgroups/systemd ]
+}
+
+post_install() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ echo "systemd has been installed to /bin/systemd. Please ensure you append"
+ echo "init=/bin/systemd to your kernel command line in your bootloader."
+}
+
+post_upgrade() {
+ checkgroups
+
+ if [ ! -f etc/machine-id ]; then
+ systemd-machine-id-setup
+ fi
+
+ if sd_booted; then
+ systemctl daemon-reexec >/dev/null
+ fi
+
+ newpkgver=${1%-*}
+ oldpkgver=${2%-*}
+
+ # catch v31 need for restarting systemd-logind.service
+ if [ "$newpkgver" -ge 31 ] && [ "$oldpkgver" -lt 31 ]; then
+ # but only if systemd is running
+ if sd_booted; then
+ systemctl try-restart systemd-logind.service
+ fi
+ fi
+}
+
+post_remove() {
+ if getent group lock >/dev/null; then
+ groupdel lock
+ fi
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list