Wed Feb 15 20:35:56 UTC 2012

4 files changed, 0 insertions, 189 deletions

diff --git a/testing/systemd/0001-mount-fix-automount-regression.patch b/testing/systemd/0001-mount-fix-automount-regression.patch
deleted file mode 100644
index a064f20cf..000000000
--- a/testing/systemd/0001-mount-fix-automount-regression.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From da375869ff31f83938123dc0d2a8d5c0f0845a0c Mon Sep 17 00:00:00 2001
-From: Michal Schmidt <mschmidt@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
-
diff --git a/testing/systemd/PKGBUILD b/testing/systemd/PKGBUILD
deleted file mode 100644
index 383786889..000000000
--- a/testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,86 +0,0 @@
-# $Id: PKGBUILD 149810 2012-02-11 02:14:31Z dreisner $
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-
-pkgname=systemd
-pkgver=42
-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' 'kmod' 'libcap' 'util-linux' 'udev' 'xz')
-makedepends=('gperf' 'cryptsetup' 'docbook-xsl' 'intltool' 'libxslt' '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="$pkgname.install"
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        "os-release")
-md5sums=('7686b44e368d2523901d3e903ed4dcea'
-         '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@.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
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  # symlink to /bin/systemd for compat and sanity
-  ln -s ../lib/systemd/systemd "$pkgdir"/bin/systemd
-
-  # 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"
-
-  # not building this with systemd
-  rm -f "man1/systemadm.1"
-
-  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
diff --git a/testing/systemd/os-release b/testing/systemd/os-release
deleted file mode 100644
index 5e24a6031..000000000
--- a/testing/systemd/os-release
+++ /dev/null
@@ -1,5 +0,0 @@
-NAME="Arch Linux"
-ID=arch
-PRETTY_NAME="Arch Linux"
-ANSI_COLOR="1;36"
-
diff --git a/testing/systemd/systemd.install b/testing/systemd/systemd.install
deleted file mode 100644
index f31642e13..000000000
--- a/testing/systemd/systemd.install
+++ /dev/null
@@ -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: