[arch-commits] Commit in systemd/trunk (8 files)
Dave Reisner
dreisner at nymeria.archlinux.org
Tue Jul 23 12:44:57 UTC 2013
Date: Tuesday, July 23, 2013 @ 14:44:57
Author: dreisner
Revision: 191301
prepare 206 release, fixup systemd initcpio hook
Modified:
systemd/trunk/PKGBUILD
systemd/trunk/initcpio-hook-udev
systemd/trunk/initcpio-install-systemd
systemd/trunk/initcpio-install-udev
systemd/trunk/systemd.install
Deleted:
systemd/trunk/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
systemd/trunk/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
systemd/trunk/initcpio-install-timestamp
-----------------------------------------------------------------+
0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch | 87 ---
0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch | 255 ----------
PKGBUILD | 40 -
initcpio-hook-udev | 2
initcpio-install-systemd | 81 +--
initcpio-install-timestamp | 14
initcpio-install-udev | 2
systemd.install | 11
8 files changed, 63 insertions(+), 429 deletions(-)
Deleted: 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
===================================================================
--- 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 2013-07-23 12:42:33 UTC (rev 191300)
+++ 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch 2013-07-23 12:44:57 UTC (rev 191301)
@@ -1,87 +0,0 @@
-From 23ad4dd8844c582929115a11ed2830a1371568d6 Mon Sep 17 00:00:00 2001
-From: "Jan Alexander Steffens (heftig)" <jan.steffens at gmail.com>
-Date: Tue, 28 May 2013 20:45:34 +0200
-Subject: [PATCH] journald: DO recalculate the ACL mask, but only if it doesn't
- exist
-
-Since 11ec7ce, journald isn't setting the ACLs properly anymore if
-the files had no ACLs to begin with: acl_set_fd fails with EINVAL.
-
-An ACL with ACL_USER or ACL_GROUP entries but no ACL_MASK entry is
-invalid, so make sure a mask exists before trying to set the ACL.
----
- src/journal/journald-server.c | 6 ++++--
- src/shared/acl-util.c | 28 ++++++++++++++++++++++++++++
- src/shared/acl-util.h | 1 +
- 3 files changed, 33 insertions(+), 2 deletions(-)
-
-diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
-index b717b92..da5b725 100644
---- a/src/journal/journald-server.c
-+++ b/src/journal/journald-server.c
-@@ -227,9 +227,11 @@ void server_fix_perms(Server *s, JournalFile *f, uid_t uid) {
- }
- }
-
-- /* We do not recalculate the mask here, so that the fchmod() mask above stays intact. */
-+ /* We do not recalculate the mask unconditionally here,
-+ * so that the fchmod() mask above stays intact. */
- if (acl_get_permset(entry, &permset) < 0 ||
-- acl_add_perm(permset, ACL_READ) < 0) {
-+ acl_add_perm(permset, ACL_READ) < 0 ||
-+ calc_acl_mask_if_needed(&acl) < 0) {
- log_warning("Failed to patch ACL on %s, ignoring: %m", f->path);
- goto finish;
- }
-diff --git a/src/shared/acl-util.c b/src/shared/acl-util.c
-index 48bb12f..fb04e49 100644
---- a/src/shared/acl-util.c
-+++ b/src/shared/acl-util.c
-@@ -69,6 +69,34 @@ int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry) {
- return 0;
- }
-
-+int calc_acl_mask_if_needed(acl_t *acl_p) {
-+ acl_entry_t i;
-+ int found;
-+
-+ assert(acl_p);
-+
-+ for (found = acl_get_entry(*acl_p, ACL_FIRST_ENTRY, &i);
-+ found > 0;
-+ found = acl_get_entry(*acl_p, ACL_NEXT_ENTRY, &i)) {
-+
-+ acl_tag_t tag;
-+
-+ if (acl_get_tag_type(i, &tag) < 0)
-+ return -errno;
-+
-+ if (tag == ACL_MASK)
-+ return 0;
-+ }
-+
-+ if (found < 0)
-+ return -errno;
-+
-+ if (acl_calc_mask(acl_p) < 0)
-+ return -errno;
-+
-+ return 0;
-+}
-+
- int search_acl_groups(char*** dst, const char* path, bool* belong) {
- acl_t acl;
-
-diff --git a/src/shared/acl-util.h b/src/shared/acl-util.h
-index 23090d9..36ef490 100644
---- a/src/shared/acl-util.h
-+++ b/src/shared/acl-util.h
-@@ -24,4 +24,5 @@
- #include <stdbool.h>
-
- int acl_find_uid(acl_t acl, uid_t uid, acl_entry_t *entry);
-+int calc_acl_mask_if_needed(acl_t *acl_p);
- int search_acl_groups(char*** dst, const char* path, bool* belong);
---
-1.8.3
-
Deleted: 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
===================================================================
--- 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch 2013-07-23 12:42:33 UTC (rev 191300)
+++ 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch 2013-07-23 12:44:57 UTC (rev 191301)
@@ -1,255 +0,0 @@
-From 3f92e4b4b61042391bd44de4dceb18177df0dd57 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart at poettering.net>
-Date: Thu, 16 May 2013 00:19:03 +0200
-Subject: [PATCH] utmp: turn systemd-update-utmp-shutdown.service into a normal
- runtime service
-
-With this change systemd-update-utmp-shutdown.service is replaced by
-systemd-update-utmp.service which is started at boot and stays around
-until shutdown. This allows us to properly order the unit against both
-/var/log and auditd.
-
-https://bugzilla.redhat.com/show_bug.cgi?id=853104
-https://bugs.freedesktop.org/show_bug.cgi?id=64365
----
- Makefile-man.am | 12 ++++++------
- Makefile.am | 8 ++++----
- ....service.xml => systemd-update-utmp.service.xml} | 16 ++++++++--------
- src/update-utmp/update-utmp.c | 2 +-
- units/.gitignore | 2 +-
- units/systemd-update-utmp-runlevel.service.in | 8 +++++---
- units/systemd-update-utmp-shutdown.service.in | 19 -------------------
- units/systemd-update-utmp.service.in | 21 +++++++++++++++++++++
- 8 files changed, 46 insertions(+), 42 deletions(-)
- rename man/{systemd-update-utmp-runlevel.service.xml => systemd-update-utmp.service.xml} (82%)
- delete mode 100644 units/systemd-update-utmp-shutdown.service.in
- create mode 100644 units/systemd-update-utmp.service.in
-
-diff --git a/Makefile-man.am b/Makefile-man.am
-index 7d62094..5888158 100644
---- a/Makefile-man.am
-+++ b/Makefile-man.am
-@@ -72,7 +72,7 @@ MANPAGES += \
- man/systemd-tmpfiles.8 \
- man/systemd-tty-ask-password-agent.1 \
- man/systemd-udevd.service.8 \
-- man/systemd-update-utmp-runlevel.service.8 \
-+ man/systemd-update-utmp.service.8 \
- man/systemd.1 \
- man/systemd.automount.5 \
- man/systemd.device.5 \
-@@ -191,7 +191,7 @@ MANPAGES_ALIAS += \
- man/systemd-udevd-control.socket.8 \
- man/systemd-udevd-kernel.socket.8 \
- man/systemd-udevd.8 \
-- man/systemd-update-utmp-shutdown.service.8 \
-+ man/systemd-update-utmp-runlevel.service.8 \
- man/systemd-update-utmp.8 \
- man/systemd-user.conf.5
- man/SD_ALERT.3: man/sd-daemon.3
-@@ -289,8 +289,8 @@ man/systemd-tmpfiles-setup.service.8: man/systemd-tmpfiles.8
- man/systemd-udevd-control.socket.8: man/systemd-udevd.service.8
- man/systemd-udevd-kernel.socket.8: man/systemd-udevd.service.8
- man/systemd-udevd.8: man/systemd-udevd.service.8
--man/systemd-update-utmp-shutdown.service.8: man/systemd-update-utmp-runlevel.service.8
--man/systemd-update-utmp.8: man/systemd-update-utmp-runlevel.service.8
-+man/systemd-update-utmp-runlevel.service.8: man/systemd-update-utmp.service.8
-+man/systemd-update-utmp.8: man/systemd-update-utmp.service.8
- man/systemd-user.conf.5: man/systemd-system.conf.5
- man/SD_ALERT.html: man/sd-daemon.html
- $(html-alias)
-@@ -577,10 +577,10 @@ man/systemd-udevd-kernel.socket.html: man/systemd-udevd.service.html
- man/systemd-udevd.html: man/systemd-udevd.service.html
- $(html-alias)
-
--man/systemd-update-utmp-shutdown.service.html: man/systemd-update-utmp-runlevel.service.html
-+man/systemd-update-utmp-runlevel.service.html: man/systemd-update-utmp.service.html
- $(html-alias)
-
--man/systemd-update-utmp.html: man/systemd-update-utmp-runlevel.service.html
-+man/systemd-update-utmp.html: man/systemd-update-utmp.service.html
- $(html-alias)
-
- man/systemd-user.conf.html: man/systemd-system.conf.html
-diff --git a/Makefile.am b/Makefile.am
-index 8d8139c..4c5e6fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -417,8 +417,8 @@ nodist_systemunit_DATA = \
- units/systemd-initctl.service \
- units/systemd-shutdownd.service \
- units/systemd-remount-fs.service \
-+ units/systemd-update-utmp.service \
- units/systemd-update-utmp-runlevel.service \
-- units/systemd-update-utmp-shutdown.service \
- units/systemd-tmpfiles-setup-dev.service \
- units/systemd-tmpfiles-setup.service \
- units/systemd-tmpfiles-clean.service \
-@@ -463,8 +463,8 @@ EXTRA_DIST += \
- units/systemd-initctl.service.in \
- units/systemd-shutdownd.service.in \
- units/systemd-remount-fs.service.in \
-+ units/systemd-update-utmp.service.in \
- units/systemd-update-utmp-runlevel.service.in \
-- units/systemd-update-utmp-shutdown.service.in \
- units/systemd-tmpfiles-setup-dev.service.in \
- units/systemd-tmpfiles-setup.service.in \
- units/systemd-tmpfiles-clean.service.in \
-@@ -4070,8 +4070,8 @@ RUNLEVEL4_TARGET_WANTS += \
- RUNLEVEL5_TARGET_WANTS += \
- systemd-update-utmp-runlevel.service
- endif
--SHUTDOWN_TARGET_WANTS += \
-- systemd-update-utmp-shutdown.service
-+SYSINIT_TARGET_WANTS += \
-+ systemd-update-utmp.service
- LOCAL_FS_TARGET_WANTS += \
- systemd-remount-fs.service \
- systemd-fsck-root.service \
-diff --git a/man/systemd-update-utmp-runlevel.service.xml b/man/systemd-update-utmp.service.xml
-similarity index 82%
-rename from man/systemd-update-utmp-runlevel.service.xml
-rename to man/systemd-update-utmp.service.xml
-index 867b958..846fc95 100644
---- a/man/systemd-update-utmp-runlevel.service.xml
-+++ b/man/systemd-update-utmp.service.xml
-@@ -19,10 +19,10 @@
- You should have received a copy of the GNU Lesser General Public License
- along with systemd; If not, see <http://www.gnu.org/licenses/>.
- -->
--<refentry id="systemd-update-utmp-runlevel.service">
-+<refentry id="systemd-update-utmp.service">
-
- <refentryinfo>
-- <title>systemd-update-utmp-runlevel.service</title>
-+ <title>systemd-update-utmp.service</title>
- <productname>systemd</productname>
-
- <authorgroup>
-@@ -36,21 +36,21 @@
- </refentryinfo>
-
- <refmeta>
-- <refentrytitle>systemd-update-utmp-runlevel.service</refentrytitle>
-+ <refentrytitle>systemd-update-utmp.service</refentrytitle>
- <manvolnum>8</manvolnum>
- </refmeta>
-
- <refnamediv>
-+ <refname>systemd-update-utmp.service</refname>
- <refname>systemd-update-utmp-runlevel.service</refname>
-- <refname>systemd-update-utmp-shutdown.service</refname>
- <refname>systemd-update-utmp</refname>
-- <refpurpose>Write audit and utmp updates at runlevel
-+ <refpurpose>Write audit and utmp updates at bootup, runlevel
- changes and shutdown</refpurpose>
- </refnamediv>
-
- <refsynopsisdiv>
-+ <para><filename>systemd-update-utmp.service</filename></para>
- <para><filename>systemd-update-utmp-runlevel.service</filename></para>
-- <para><filename>systemd-update-utmp-shutdown.service</filename></para>
- <para><filename>/usr/lib/systemd/systemd-update-utmp</filename></para>
- </refsynopsisdiv>
-
-@@ -60,8 +60,8 @@
- <para><filename>systemd-update-utmp-runlevel.service</filename>
- is a service that writes SysV runlevel changes to utmp
- and wtmp, as well as the audit logs, as they
-- occur. <filename>systemd-update-utmp-shutdown.service</filename>
-- does the same for shut-down requests.</para>
-+ occur. <filename>systemd-update-utmp.service</filename>
-+ does the same for system reboots and shut-down requests.</para>
- </refsect1>
-
- <refsect1>
-diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
-index 9184025..202aa98 100644
---- a/src/update-utmp/update-utmp.c
-+++ b/src/update-utmp/update-utmp.c
-@@ -104,7 +104,7 @@ static int get_current_runlevel(Context *c) {
- { '3', SPECIAL_RUNLEVEL3_TARGET },
- { '4', SPECIAL_RUNLEVEL4_TARGET },
- { '2', SPECIAL_RUNLEVEL2_TARGET },
-- { 'S', SPECIAL_RESCUE_TARGET },
-+ { '1', SPECIAL_RESCUE_TARGET },
- };
- const char
- *interface = "org.freedesktop.systemd1.Unit",
-diff --git a/units/systemd-update-utmp-runlevel.service.in b/units/systemd-update-utmp-runlevel.service.in
-index 27fae2c..99783e2 100644
---- a/units/systemd-update-utmp-runlevel.service.in
-+++ b/units/systemd-update-utmp-runlevel.service.in
-@@ -7,12 +7,14 @@
-
- [Unit]
- Description=Update UTMP about System Runlevel Changes
--Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
-+Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
- DefaultDependencies=no
- RequiresMountsFor=/var/log/wtmp
--After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
-+Conflicts=shutdown.target
-+Requisite=systemd-update-utmp.service
-+After=systemd-update-utmp.service
- After=runlevel1.target runlevel2.target runlevel3.target runlevel4.target runlevel5.target
--Before=final.target
-+Before=shutdown.target
-
- [Service]
- Type=oneshot
-diff --git a/units/systemd-update-utmp-shutdown.service.in b/units/systemd-update-utmp-shutdown.service.in
-deleted file mode 100644
-index aa93562..0000000
---- a/units/systemd-update-utmp-shutdown.service.in
-+++ /dev/null
-@@ -1,19 +0,0 @@
--# This file is part of systemd.
--#
--# systemd is free software; you can redistribute it and/or modify it
--# under the terms of the GNU Lesser General Public License as published by
--# the Free Software Foundation; either version 2.1 of the License, or
--# (at your option) any later version.
--
--[Unit]
--Description=Update UTMP about System Shutdown
--Documentation=man:systemd-update-utmp-runlevel.service(8) man:utmp(5)
--DefaultDependencies=no
--RequiresMountsFor=/var/log/wtmp
--After=systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
--After=systemd-update-utmp-runlevel.service
--Before=final.target
--
--[Service]
--Type=oneshot
--ExecStart=@rootlibexecdir@/systemd-update-utmp shutdown
-diff --git a/units/systemd-update-utmp.service.in b/units/systemd-update-utmp.service.in
-new file mode 100644
-index 0000000..e7c20a5
---- /dev/null
-+++ b/units/systemd-update-utmp.service.in
-@@ -0,0 +1,21 @@
-+# This file is part of systemd.
-+#
-+# systemd is free software; you can redistribute it and/or modify it
-+# under the terms of the GNU Lesser General Public License as published by
-+# the Free Software Foundation; either version 2.1 of the License, or
-+# (at your option) any later version.
-+
-+[Unit]
-+Description=Update UTMP about System Reboot/Shutdown
-+Documentation=man:systemd-update-utmp.service(8) man:utmp(5)
-+DefaultDependencies=no
-+RequiresMountsFor=/var/log/wtmp
-+Conflicts=shutdown.target
-+After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-remount-fs.service systemd-tmpfiles-setup.service auditd.service
-+Before=sysinit.target shutdown.target
-+
-+[Service]
-+Type=oneshot
-+RemainAfterExit=yes
-+ExecStart=@rootlibexecdir@/systemd-update-utmp reboot
-+ExecStop=@rootlibexecdir@/systemd-update-utmp shutdown
---
-1.8.2.3
-
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-07-23 12:42:33 UTC (rev 191300)
+++ PKGBUILD 2013-07-23 12:44:57 UTC (rev 191301)
@@ -3,8 +3,8 @@
pkgbase=systemd
pkgname=('systemd' 'systemd-sysvcompat')
-pkgver=204
-pkgrel=3
+pkgver=206
+pkgrel=1
arch=('i686' 'x86_64')
url="http://www.freedesktop.org/wiki/Software/systemd"
license=('GPL2' 'LGPL2.1' 'MIT')
@@ -13,35 +13,18 @@
'linux-api-headers' 'pam' 'python' 'quota-tools' 'xz')
options=('!libtool')
source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
- 0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch
- 0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch
'initcpio-hook-udev'
'initcpio-install-systemd'
- 'initcpio-install-udev'
- 'initcpio-install-timestamp')
-md5sums=('a07619bb19f48164fbf0761d12fd39a8'
- '7f39f9fde1ff7b48293ed1e3d0a6c213'
- '66e3162856ded8eb7dc7383405c6e0d6'
- 'e99e9189aa2f6084ac28b8ddf605aeb8'
- 'f5edda743fb0611f11f9b82ecddcf4b3'
- 'fb37e34ea006c79be1c54cbb0f803414'
- 'df69615503ad293c9ddf9d8b7755282d')
+ 'initcpio-install-udev')
+md5sums=('89e36f2d3ba963020b72738549954cbc'
+ '2de72238ed5c0df62a7c3b6bdaf8cb7c'
+ '8bbda541cd275a82134de472e832d49d'
+ 'd83d45e67cd75cdbafb81c96a7485319')
-prepare() {
- cd "$pkgname-$pkgver"
-
- patch -Np1 <"$srcdir/0001-utmp-turn-systemd-update-utmp-shutdown.service-into-.patch"
-
- patch -Np1 <"$srcdir/0001-journald-DO-recalculate-the-ACL-mask-but-only-if-it-.patch"
-
- autoreconf
-}
-
build() {
cd "$pkgname-$pkgver"
./configure \
- --enable-static \
--libexecdir=/usr/lib \
--localstatedir=/var \
--sysconfdir=/etc \
@@ -79,11 +62,13 @@
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.machine1.conf
etc/dbus-1/system.d/org.freedesktop.timedate1.conf
+ etc/systemd/bootchart.conf
+ etc/systemd/journald.conf
+ etc/systemd/logind.conf
etc/systemd/system.conf
etc/systemd/user.conf
- etc/systemd/logind.conf
- etc/systemd/journald.conf
etc/udev/udev.conf)
install="systemd.install"
@@ -101,7 +86,7 @@
rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
# get rid of RPM macros
- rm -r "$pkgdir/etc/rpm"
+ rm -r "$pkgdir/usr/lib/rpm/macros.d"
# add back tmpfiles.d/legacy.conf
install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d"
@@ -115,7 +100,6 @@
install -Dm644 "$srcdir/initcpio-install-systemd" "$pkgdir/usr/lib/initcpio/install/systemd"
install -Dm644 "$srcdir/initcpio-install-udev" "$pkgdir/usr/lib/initcpio/install/udev"
install -Dm644 "$srcdir/initcpio-hook-udev" "$pkgdir/usr/lib/initcpio/hooks/udev"
- install -Dm644 "$srcdir/initcpio-install-timestamp" "$pkgdir/usr/lib/initcpio/install/timestamp"
### split out manpages for sysvcompat
rm -rf "$srcdir/_sysvcompat"
Modified: initcpio-hook-udev
===================================================================
--- initcpio-hook-udev 2013-07-23 12:42:33 UTC (rev 191300)
+++ initcpio-hook-udev 2013-07-23 12:44:57 UTC (rev 191301)
@@ -1,7 +1,7 @@
#!/usr/bin/ash
run_earlyhook() {
- udevd --daemon --resolve-names=never
+ /usr/lib/systemd/systemd-udevd --daemon --resolve-names=never
udevd_running=1
}
Modified: initcpio-install-systemd
===================================================================
--- initcpio-install-systemd 2013-07-23 12:42:33 UTC (rev 191300)
+++ initcpio-install-systemd 2013-07-23 12:44:57 UTC (rev 191301)
@@ -1,6 +1,6 @@
#!/bin/bash
-add_udev_rules() {
+add_udev_rule() {
# Add an udev rules file to the initcpio image. Dependencies on binaries
# will be discovered and added.
# $1: path to rules file (or name of rules file)
@@ -13,14 +13,14 @@
return 1
fi
- add_file "${rules}"
+ add_file "$rules"
while IFS=, read -ra rule; do
for pair in "${rule[@]}"; do
IFS='=' read -r key value <<< "$pair"
case $key in
- RUN@({program}|)@(+|)|IMPORT{program}|ENV{REMOVE_CMD})
+ RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
binary=${value[0]#\"}
if [[ ${binary:0:1} != '/' ]]; then
binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
@@ -45,10 +45,9 @@
return 1
fi
- add_file "${unit}"
+ add_file "$unit"
while IFS='=' read -r key values; do
-
read -ra values <<< "$values"
case $key in
@@ -67,17 +66,17 @@
done < "$unit"
# preserve reverse soft dependency
- for dep in {/usr/lib/systemd/system,/lib/systemd/system}/*.wants/${unit##*/}; do
- if [[ -h "${dep}" ]]; then
- add_symlink "${dep}"
+ for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do
+ if [[ -L $dep ]]; then
+ add_symlink "$dep"
fi
done
# add hard dependencies
- if [[ -d "${unit}.requires" ]]; then
- for dep in "${unit}".requires/*; do
+ if [[ -d $unit.requires ]]; then
+ for dep in "$unit".requires/*; do
add_systemd_unit ${dep##*/}
- done
+ done
fi
}
@@ -95,43 +94,38 @@
add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator"
# udev rules and systemd units
- for rules in \
- 50-udev-default.rules \
- 60-persistent-storage.rules \
- 64-btrfs.rules \
- 80-drivers.rules \
- 99-systemd.rules \
- ; do
- add_udev_rules "$rules"
- done
- for unit in \
- systemd-udevd-control.socket \
- systemd-udevd-kernel.socket \
- sockets.target \
- systemd-journald.service \
- systemd-udevd.service \
- systemd-udev-trigger.service \
- initrd-cleanup.service \
- initrd-fs.target \
- initrd-parse-etc.service \
- initrd-root-fs.target \
- initrd-switch-root.service \
- initrd-switch-root.target \
- initrd-udevadm-cleanup-db.service \
- initrd.target \
- systemd-fsck at .service \
- ctrl-alt-del.target \
- ; do
- add_systemd_unit "$unit"
- done
+ map add_udev_rule "$rules" \
+ 50-udev-default.rules \
+ 60-persistent-storage.rules \
+ 64-btrfs.rules \
+ 80-drivers.rules \
+ 99-systemd.rules \
+ map add_systemd_unit \
+ systemd-udevd-control.socket \
+ systemd-udevd-kernel.socket \
+ sockets.target \
+ systemd-journald.service \
+ systemd-udevd.service \
+ systemd-udev-trigger.service \
+ initrd-cleanup.service \
+ initrd-fs.target \
+ initrd-parse-etc.service \
+ initrd-root-fs.target \
+ initrd-switch-root.service \
+ initrd-switch-root.target \
+ initrd-udevadm-cleanup-db.service \
+ initrd.target \
+ systemd-fsck at .service \
+ ctrl-alt-del.target
+
add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
-
# libdbus needs the passwd info of the root user
# TODO: make sure this is no longer necessary when systemctl moves to sd-bus
add_file "/etc/nsswitch.conf"
add_file "/etc/passwd"
+ add_file "/etc/group"
add_file "/lib/libnss_files-2.17.so"
add_symlink "/lib/libnss_files.so.2" "libnss_files-2.17.so"
add_symlink "/lib/libnss_files.so" "libnss_files.so.2"
@@ -139,8 +133,9 @@
help() {
cat <<HELPEOF
-This will install a basic systemd setup on your initrd, it is meant to replace the 'base', 'usr', 'fsck' and 'timestamp' hooks.
-Other hooks would need to be ported, and may not work as intended.
+This will install a basic systemd setup on your initrd, it is meant to replace
+the 'base', 'usr', 'udev' and 'timestamp' hooks. Other hooks would need to be
+ported, and may not work as intended.
HELPEOF
}
Deleted: initcpio-install-timestamp
===================================================================
--- initcpio-install-timestamp 2013-07-23 12:42:33 UTC (rev 191300)
+++ initcpio-install-timestamp 2013-07-23 12:44:57 UTC (rev 191301)
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
- add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
- cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
Modified: initcpio-install-udev
===================================================================
--- initcpio-install-udev 2013-07-23 12:42:33 UTC (rev 191300)
+++ initcpio-install-udev 2013-07-23 12:44:57 UTC (rev 191301)
@@ -4,7 +4,7 @@
local rules tool
add_file "/etc/udev/udev.conf"
- add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
+ add_binary /usr/lib/systemd/systemd-udevd
add_binary /usr/bin/udevadm
for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules; do
Modified: systemd.install
===================================================================
--- systemd.install 2013-07-23 12:42:33 UTC (rev 191300)
+++ systemd.install 2013-07-23 12:44:57 UTC (rev 191301)
@@ -87,6 +87,17 @@
printf '==> The /bin/systemd symlink has been removed. Any references in your\n'
printf ' bootloader (or elsewhere) must be updated to /usr/lib/systemd/systemd.\n'
fi
+
+ if [ "$(vercmp 205-1 "$2")" -eq 1 ]; then
+ printf '==> systemd 205 restructures the cgroup hierarchy and changes internal\n'
+ printf ' protocols. You should reboot at your earliest convenience.\n'
+ fi
+
+ if [ "$(vercmp 206-1 "$2")" -eq 1 ]; then
+ printf '==> The "timestamp" hook for mkinitcpio no longer exists. If you used\n'
+ printf ' this hook, you must remove it from /etc/mkinitcpio.conf. A "systemd"\n'
+ printf ' hook has been added which provides this functionality, and more.\n'
+ fi
}
# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list