Date: Sunday, August 26, 2012 @ 10:35:40 Author: dreisner Revision: 165587
upgpkg: systemd 189-1 - merge systemd-tools and libsystemd into systemd - cleanup redundant configure flags with /lib symlinked - prune systemd-arch-units from optdepends Modified: systemd/trunk/PKGBUILD systemd/trunk/systemd.install Deleted: systemd/trunk/0001-shutdown-recursively-mark-root-as-private-before-piv.patch systemd/trunk/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch systemd/trunk/systemd-tools.install -----------------------------------------------------------------+ 0001-shutdown-recursively-mark-root-as-private-before-piv.patch | 31 - 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch | 73 ---- PKGBUILD | 161 ++-------- systemd-tools.install | 35 -- systemd.install | 14 5 files changed, 44 insertions(+), 270 deletions(-) Deleted: 0001-shutdown-recursively-mark-root-as-private-before-piv.patch =================================================================== --- 0001-shutdown-recursively-mark-root-as-private-before-piv.patch 2012-08-26 13:51:21 UTC (rev 165586) +++ 0001-shutdown-recursively-mark-root-as-private-before-piv.patch 2012-08-26 14:35:40 UTC (rev 165587) @@ -1,31 +0,0 @@ -From 4bfa638d43c05e8db052cd55818765bb3575a405 Mon Sep 17 00:00:00 2001 -From: Dave Reisner <[email protected]> -Date: Fri, 10 Aug 2012 11:02:03 -0400 -Subject: [PATCH] shutdown: recursively mark root as private before pivot - -Because root is now recursively marked as shared on bootup, we need to -recursively mark root as private. This prevents a pivot_root failure on -shutdown: - - Cannot finalize remaining file systems and devices, giving up. - pivot failed: Invalid argument ---- - src/core/shutdown.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/core/shutdown.c b/src/core/shutdown.c -index 105a604..0b7cbd8 100644 ---- a/src/core/shutdown.c -+++ b/src/core/shutdown.c -@@ -109,7 +109,7 @@ static int pivot_to_new_root(void) { - It works for pivot_root, but the ref count for the root device - is not decreasing :-/ - */ -- if (mount(NULL, "/", NULL, MS_PRIVATE, NULL) < 0) { -+ if (mount(NULL, "/", NULL, MS_REC|MS_PRIVATE, NULL) < 0) { - log_error("Failed to make \"/\" private mount %m"); - return -errno; - } --- -1.7.11.4 - Deleted: 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch =================================================================== --- 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch 2012-08-26 13:51:21 UTC (rev 165586) +++ 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch 2012-08-26 14:35:40 UTC (rev 165587) @@ -1,73 +0,0 @@ -From c516c8d17f77a1c761447f4c40c8dfffeda2e06d Mon Sep 17 00:00:00 2001 -From: Simon Peeters <[email protected]> -Date: Fri, 10 Aug 2012 17:32:19 +0200 -Subject: [PATCH] systemctl: fix issue with systemctl daemon-reexec - ---- - src/shared/dbus-common.c | 3 ++- - src/systemctl/systemctl.c | 11 ++++++++--- - 2 files changed, 10 insertions(+), 4 deletions(-) - -diff --git a/src/shared/dbus-common.c b/src/shared/dbus-common.c -index 7f0dce5..da2dc2e 100644 ---- a/src/shared/dbus-common.c -+++ b/src/shared/dbus-common.c -@@ -1287,7 +1287,8 @@ int bus_method_call_with_reply(DBusConnection *bus, - reply = dbus_connection_send_with_reply_and_block(bus, m, -1, &error); - dbus_message_unref(m); - if (!reply) { -- log_error("Failed to issue method call: %s", bus_error_message(&error)); -+ if (!return_error) -+ log_error("Failed to issue method call: %s", bus_error_message(&error)); - if (bus_error_is_no_service(&error)) - r = -ENOENT; - else if (dbus_error_has_name(&error, DBUS_ERROR_ACCESS_DENIED)) -diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 2e0aaaa..13e0f91 100644 ---- a/src/systemctl/systemctl.c -+++ b/src/systemctl/systemctl.c -@@ -1537,11 +1537,12 @@ static int start_unit_one( - DBUS_TYPE_INVALID); - free(n); - if (r) { -- if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) { -+ if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL ) - /* There's always a fallback possible for - * legacy actions. */ - r = -EADDRNOTAVAIL; -- } -+ else -+ log_error("Failed to issue method call: %s", bus_error_message(error)); - goto finish; - } - -@@ -3143,6 +3144,7 @@ finish: - static int daemon_reload(DBusConnection *bus, char **args) { - int r; - const char *method; -+ DBusError error; - - if (arg_action == ACTION_RELOAD) - method = "Reload"; -@@ -3171,7 +3173,7 @@ static int daemon_reload(DBusConnection *bus, char **args) { - "org.freedesktop.systemd1.Manager", - method, - NULL, -- NULL, -+ &error, - DBUS_TYPE_INVALID); - - if (r == -ENOENT && arg_action != ACTION_SYSTEMCTL) -@@ -3182,6 +3184,9 @@ static int daemon_reload(DBusConnection *bus, char **args) { - /* On reexecution, we expect a disconnect, not - * a reply */ - r = 0; -+ else if (r) -+ log_error("Failed to issue method call: %s", bus_error_message(&error)); -+ dbus_error_free(&error); - - return r; - } --- -1.7.11.4 - Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-08-26 13:51:21 UTC (rev 165586) +++ PKGBUILD 2012-08-26 14:35:40 UTC (rev 165587) @@ -2,9 +2,9 @@ # Contributor: Tom Gundersen <[email protected]> pkgbase=systemd -pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat') -pkgver=188 -pkgrel=2 +pkgname=('systemd' 'systemd-sysvcompat') +pkgver=189 +pkgrel=1 arch=('i686' 'x86_64') url="http://www.freedesktop.org/wiki/Software/systemd"; license=('GPL2' 'LGPL2.1' 'MIT') @@ -15,36 +15,26 @@ 'initcpio-hook-udev' 'initcpio-install-udev' 'initcpio-install-timestamp' + 'locale.sh' '0001-Reinstate-TIMEOUT-handling.patch' - 'locale.sh' - 0001-shutdown-recursively-mark-root-as-private-before-piv.patch - 0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch 'use-split-usr-path.patch') -md5sums=('d89b42699695554949d072ef46c0dfc9' +md5sums=('ac2eb313f5dce79622f60aac56bca66d' 'e99e9189aa2f6084ac28b8ddf605aeb8' '59e91c4d7a69b7bf12c86a9982e37ced' 'df69615503ad293c9ddf9d8b7755282d' + 'f15956945052bb911e5df81cf5e7e5dc' '5543be25f205f853a21fa5ee68e03f0d' - 'f15956945052bb911e5df81cf5e7e5dc' - '49d145ef3ca299025c085555314212b6' - 'bccb994f4cfbd251b6c34d7d90a6ba0f' '482dba45a783f06c2239f1355f4ce72f') build() { cd "$pkgname-$pkgver" - # still waiting on ipw2x00 to get fixed... + # still waiting on ipw2x00, et al to get fixed... patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch" + + # hang onto this until we do the /{,s}bin merge patch -Np1 <"$srcdir/use-split-usr-path.patch" - # http://bugs.archlinux.org/task/31089 - # upstream c516c8d17f77a1c761447f4c40c8dfffeda2e06d - patch -Np1 <"$srcdir/0001-systemctl-fix-issue-with-systemctl-daemon-reexec.patch" - - # http://bugs.archlinux.org/task/31092 - # upstream 4bfa638d43c05e8db052cd55818765bb3575a405 - patch -Np1 <"$srcdir/0001-shutdown-recursively-mark-root-as-private-before-piv.patch" - ./configure \ --libexecdir=/usr/lib \ --localstatedir=/var \ @@ -53,24 +43,24 @@ --enable-gtk-doc \ --disable-audit \ --disable-ima \ - --with-pamlibdir=/usr/lib/security \ --with-distro=arch \ --with-usb-ids-path=/usr/share/hwdata/usb.ids \ - --with-pci-ids-path=/usr/share/hwdata/pci.ids \ - --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware + --with-pci-ids-path=/usr/share/hwdata/pci.ids make } package_systemd() { pkgdesc="system and service manager" - depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam' - "systemd-tools=$pkgver" 'util-linux' 'xz') + depends=('acl' 'bash' 'dbus-core' 'glib2' 'kbd' 'kmod' 'hwids' 'libcap' 'pam' 'util-linux' 'xz') + provides=("libsystemd=$pkgver" "systemd-tools=$pkgver" "udev=$pkgver") + replaces=('libsystemd' 'systemd-tools' 'udev') + conflicts=('libsystemd' 'systemd-tools' 'udev') optdepends=('initscripts: legacy support for /etc/rc.conf' 'python2-cairo: systemd-analyze' 'python2-dbus: systemd-analyze' - 'systemd-arch-units: collection of native unit files for Arch daemon/init scripts' - 'systemd-sysvcompat: symlink package to provide sysvinit binaries') + 'systemd-sysvcompat: symlink package to provide sysvinit binaries' + 'cryptsetup: required for encrypted block devices') 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 @@ -79,7 +69,8 @@ etc/systemd/system.conf etc/systemd/user.conf etc/systemd/logind.conf - etc/systemd/journald.conf) + etc/systemd/journald.conf + etc/udev/udev.conf) install="systemd.install" make -C "$pkgname-$pkgver" DESTDIR="$pkgdir" install @@ -100,67 +91,41 @@ rm "$pkgdir/etc/systemd/system/getty.target.wants/[email protected]" rmdir "$pkgdir/etc/systemd/system/getty.target.wants" - ### get rid of RPM macros + # get rid of RPM macros rm -r "$pkgdir/etc/rpm" # can't use py3k yet with systemd-analyze -- the 'plot' verb will not work. # https://pokersource.info/show_bug.cgi?id=50989 sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze" - ### split off libsystemd (libs, includes, pkgconfig, man3) - rm -rf "$srcdir/_libsystemd" - install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig} - cd "$srcdir"/_libsystemd - mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib - mv "$pkgdir/usr/include/systemd" usr/include - mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig + # the path to udevadm is hardcoded in some places + install -d "$pkgdir/sbin" + ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" + # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? + ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" + + # add back tmpfiles.d/legacy.conf + install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + sed -i 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules + + # add mkinitcpio hooks + 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" + + # XXX: kill off coredump rule until the journal can recover coredumps + rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" + ### split out manpages for sysvcompat rm -rf "$srcdir/_sysvcompat" install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/ mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \ "$srcdir"/_sysvcompat/usr/share/man/man8 - - ### split out systemd-tools/udev - rm -rf "$srcdir/_tools" - install -dm755 \ - "$srcdir"/_tools/etc/udev \ - "$srcdir"/_tools/usr/bin \ - "$srcdir"/_tools/usr/include \ - "$srcdir"/_tools/usr/lib/udev \ - "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \ - "$srcdir"/_tools/usr/lib/girepository-1.0 \ - "$srcdir"/_tools/usr/share/pkgconfig \ - "$srcdir"/_tools/usr/share/gir-1.0 \ - "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \ - "$srcdir"/_tools/usr/share/man/man{1,5,7,8} - - cd "$srcdir/_tools" - mv "$pkgdir"/etc/udev etc - mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc - mv "$pkgdir"/usr/bin/udevadm usr/bin - mv "$pkgdir"/usr/bin/systemd-machine-id-setup usr/bin - mv "$pkgdir"/usr/lib/pkgconfig usr/lib - mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd - mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system - mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants - mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants - mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib - mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib - mv "$pkgdir"/usr/lib/udev usr/lib - mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include - mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib - mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig - mv "$pkgdir"/usr/share/gir-1.0 usr/share - mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html - mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7 - mv "$pkgdir"/usr/share/man/man8/{systemd-tmpfiles,udevadm}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man8/systemd-udevd{,.service,{-control,-kernel}.socket}.8 usr/share/man/man8 - mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1 - mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5 - mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5 - mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin - mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd } package_systemd-sysvcompat() { @@ -179,48 +144,4 @@ install -Dm755 "$srcdir/locale.sh" "$pkgdir/etc/profile.d/locale.sh" } -package_libsystemd() { - pkgdesc="systemd client libraries" - depends=('xz') - - mv "$srcdir/_libsystemd"/* "$pkgdir" -} - -package_systemd-tools() { - pkgdesc='standalone tools from systemd' - url='http://www.freedesktop.org/wiki/Software/systemd' - depends=('acl' 'bash' 'glibc' 'glib2' 'libsystemd' 'kmod' 'hwids' 'util-linux' 'kbd') - optdepends=('cryptsetup: required for encrypted block devices') - provides=("udev=$pkgver") - conflicts=('udev') - replaces=('udev') - install='systemd-tools.install' - - mv "$srcdir/_tools/"* "$pkgdir" - - # the path to udevadm is hardcoded in some places - install -d "$pkgdir/sbin" - ln -s ../usr/bin/udevadm "$pkgdir/sbin/udevadm" - - # udevd is no longer udevd because systemd. why isn't udevadm now udevctl? - ln -s ../lib/systemd/systemd-udevd "$pkgdir/usr/bin/udevd" - - # add back tmpfiles.d/legacy.conf - install -m644 "systemd-$pkgver/tmpfiles.d/legacy.conf" "$pkgdir/usr/lib/tmpfiles.d" - - # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group - sed -i 's#GROUP="dialout"#GROUP="uucp"#g; - s#GROUP="tape"#GROUP="storage"#g; - s#GROUP="cdrom"#GROUP="optical"#g' "$pkgdir"/usr/lib/udev/rules.d/*.rules - - # add mkinitcpio hooks - 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" - - # XXX: kill off coredump rule until the journal can recover coredumps - # this file needs to come back as part of systemd, not systemd-tools - rm "$pkgdir/usr/lib/sysctl.d/coredump.conf" -} - # vim: ft=sh syn=sh et Deleted: systemd-tools.install =================================================================== --- systemd-tools.install 2012-08-26 13:51:21 UTC (rev 165586) +++ systemd-tools.install 2012-08-26 14:35:40 UTC (rev 165587) @@ -1,35 +0,0 @@ -# arg 1: the new package version -# arg 2: the old package version - -post_install() { - systemd-machine-id-setup -} - -post_upgrade() { - systemd-machine-id-setup - - if [ "$(vercmp $2 174)" -lt 0 ]; then - echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," - echo " 'scanner' and 'video' groups. Beware of any changes." - echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0." - echo " * For security reasons, we no longer add devices to the 'storage' group. Use" - echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" - echo " this functionality back." - echo " * We no longer create the static nodes on install needed for an initrd-less" - echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" - echo " installs." - fi - if [ "$(vercmp $2 175)" -lt 0 ]; then - echo " * devtmpfs support is now a hard requirement. Users of the official Arch" - echo " kernels have this enabled." - fi - if [ "$(vercmp $2 181)" -lt 0 ]; then - echo " * udev-compat has been removed, and should be uninstalled." - echo " * Framebuffers are no longer blacklisted by default." - echo " * binaries moved from /sbin to /usr/bin" - fi - if [ "$(vercmp $2 181-3)" -lt 0 ]; then - echo " * if your kernel does not provide /dev/loop-control, you need to manually" - echo " load the 'loop' module before using losetup" - fi -} Modified: systemd.install =================================================================== --- systemd.install 2012-08-26 13:51:21 UTC (rev 165586) +++ systemd.install 2012-08-26 14:35:40 UTC (rev 165587) @@ -8,22 +8,14 @@ # enable getty@tty1 by default, but don't track the file systemctl enable [email protected] + systemd-machine-id-setup + echo ":: Append 'init=/bin/systemd' to your kernel command line in your" echo " bootloader to replace sysvinit with systemd" } post_upgrade() { - if sd_booted; then - # we moved the binary in 44-2 to /usr, so a reexec leads to a - # coredump. refuse this reexec and warn the user that they should - # reboot instead. - if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then - echo "warning: refusing to reexec systemd. the system should be rebooted." - else - systemctl daemon-reload - systemctl daemon-reexec - fi - fi + systemd-machine-id-setup # [email protected] is no longer enabled by default, but we don't want to break # existing setups.
