Hello community, here is the log from the commit of package systemd for openSUSE:Factory checked in at 2012-01-26 16:00:42 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/systemd (Old) and /work/SRC/openSUSE:Factory/.systemd.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "systemd", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/systemd/systemd-gtk.changes 2011-12-12 17:04:31.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.systemd.new/systemd-gtk.changes 2012-01-26 16:00:44.000000000 +0100 @@ -1,0 +2,71 @@ +Wed Jan 25 10:37:06 UTC 2012 - fcro...@suse.com + +- Update to version 39: + + New systemd-cgtop tool to show control groups by their resource + usage. + + Linking against libacl for ACLs is optional again. + + If a group "adm" exists, journal files are automatically owned + by them, thus allow members of this group full access to the + system journal as well as all user journals. + + The journal now stores the SELinux context of the logging + client for all entries. + + Add C++ inclusion guards to all public headers. + + New output mode "cat" in the journal to print only text + messages, without any meta data like date or time. + + Include tiny X server wrapper as a temporary stop-gap to teach + XOrg udev display enumeration (until XOrg supports udev + hotplugging for display devices). + + Add new systemd-cat tool for executing arbitrary programs with + STDERR/STDOUT connected to the journal. Can also act as BSD + logger replacement, and does so by default. + + Optionally store all locally generated coredumps in the journal + along with meta data. + + systemd-tmpfiles learnt four new commands: n, L, c, b, for + writing short strings to files (for usage for /sys), and for + creating symlinks, character and block device nodes. + + New unit file option ControlGroupPersistent= to make cgroups + persistent. + + Support multiple local RTCs in a sane way. + + No longer monopolize IO when replaying readahead data on + rotating disks. + + Don't show kernel threads in systemd-cgls anymore, unless + requested with new -k switch. +- Drop systemd-syslog_away_early_on_shutdown.patch: fixed upstream. +- Add fdupes to BuildRequires and use it at build time. + +------------------------------------------------------------------- +Thu Jan 19 13:47:39 UTC 2012 - tittiatc...@gmail.com + +- Make the systemd journal persistent by creating the + /var/log/journal directory + +------------------------------------------------------------------- +Wed Jan 18 09:03:51 UTC 2012 - tittiatc...@gmail.com + +- Update to version 38 : + - Bugfixes + - Implementation of a Journal Utility Library + - Implementation of a 128 Bit ID Utility Library +- 11 Patches integrated upstream +- Add systemd-syslog_away_early_on_shutdown.patch: make sure + syslog socket goes away early during shutdown. +- Add listen.conf for rsyslog. This will ensure that it will still + work fine with rsyslog and the new journal. + +------------------------------------------------------------------- +Mon Jan 9 17:01:22 UTC 2012 - fcro...@suse.com + +- Add fix-is-enabled.patch: ensure systemctl is-enabled work + properly when systemd isn't running. +- Add logind-console.patch: do not bail logind if /dev/tty0 doesn't + exist (bnc#733022, bnc#735047). +- Add sysctl-modules.patch: ensure sysctl is started after modules + are loaded (bnc#725412). +- Fix warning in insserv patch. +- Update avoid-random-seed-cycle.patch with better upstream + approach. +- Update storage-after-cryptsetup.patch to restart lvm before + local-fs.target, not after it (bnc#740106). +- Increase pam-config dependency (bnc#713319). + +------------------------------------------------------------------- systemd.changes: same change Old: ---- color-on-boot.patch crash-isolating.patch cron-tty-pam.patch do_not_warn_pidfile.patch garbage_collect_units.patch handle-racy-daemon.patch log_on_close.patch mount-swap-log.patch systemctl-completion-fix.patch systemd-37.tar.bz2 New: ---- listen.conf sysctl-modules.patch systemd-39.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ systemd-gtk.spec ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package systemd-gtk # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,33 +15,39 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: systemd-gtk Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 37 -Release: 1 -License: GPL-2.0+ -Group: System/Base +Version: 39 +Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libudev-devel udev -BuildRequires: dbus-1-devel BuildRequires: audit-devel +BuildRequires: dbus-1-devel +BuildRequires: glib2-devel BuildRequires: gperf -BuildRequires: libcap-devel +BuildRequires: gtk2-devel +BuildRequires: intltool BuildRequires: libacl-devel +BuildRequires: libcap-devel +BuildRequires: libcryptsetup-devel +BuildRequires: libgee-devel +BuildRequires: libnotify-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel BuildRequires: libtool -BuildRequires: tcpd-devel +BuildRequires: libudev-devel BuildRequires: pam-devel -BuildRequires: libcryptsetup-devel BuildRequires: pkg-config -BuildRequires: libselinux-devel libsepol-devel -BuildRequires: intltool -BuildRequires: gtk2-devel libnotify-devel +BuildRequires: tcpd-devel +BuildRequires: udev +BuildRequires: xz +BuildRequires: xz-devel Summary: Graphical front-end for systemd +License: GPL-2.0+ +Group: System/Base Requires: systemd = %{version} -Source0: http://www.freedesktop.org/software/systemd/systemd-%{version}.tar.bz2 +Source0: http://www.freedesktop.org/software/systemd/systemd-%{version}.tar.xz Source1: systemd-rpmlintrc # Upstream First - Policy: @@ -64,7 +70,7 @@ %configure \ --with-distro=suse \ --docdir=%{_docdir}/systemd \ - --with-rootdir= \ + --with-rootprefix= \ CFLAGS="%{optflags}" make %{?_smp_mflags} ++++++ systemd.spec ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package systemd # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,7 +15,6 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild %define build_plymouth 0 @@ -23,35 +22,40 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 37 -Release: 1 +Version: 39 +Release: 0 +Summary: A System and Session Manager License: GPL-2.0+ Group: System/Base -Summary: A System and Session Manager BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: libudev-devel udev -BuildRequires: dbus-1-devel BuildRequires: audit-devel +BuildRequires: dbus-1-devel +BuildRequires: fdupes BuildRequires: gperf -BuildRequires: libcap-devel +BuildRequires: intltool BuildRequires: libacl-devel +BuildRequires: libcap-devel +BuildRequires: libcryptsetup-devel +BuildRequires: libselinux-devel +BuildRequires: libsepol-devel BuildRequires: libtool -BuildRequires: tcpd-devel +BuildRequires: libudev-devel BuildRequires: pam-devel -BuildRequires: libcryptsetup-devel BuildRequires: pkg-config -BuildRequires: libselinux-devel libsepol-devel -BuildRequires: intltool +BuildRequires: tcpd-devel +BuildRequires: udev +BuildRequires: xz +BuildRequires: xz-devel Requires: udev >= 172 Requires: dbus-1 >= 1.4.0 Requires: kbd Requires: util-linux >= 2.19 -Requires: pam-config +Requires: pam-config >= 0.79-5 Requires: systemd-presets-branding Recommends: dbus-1-python Conflicts: filesystem < 11.5 Conflicts: mkinitrd < 2.7.0 -Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.bz2 +Source0: http://www.freedesktop.org/software/systemd/%{name}-%{version}.tar.xz Source1: systemd-rpmlintrc Source2: localfs.service Source3: systemd-sysv-convert @@ -62,6 +66,8 @@ Source8: bootsplash-startup.service Source9: bootsplash-quit.service Source10: bootsplash-shutdown.service +# Stop-gap, just to ensure things work fine with rsyslog without having to change the package right-away +Source11: listen.conf Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch # handle SUSE specific kbd settings Patch6: 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch @@ -71,27 +77,19 @@ Patch13: 0001-service-flags-sysv-service-with-detected-pid-as-Rema.patch Patch15: support-sysvinit.patch Patch16: modules_on_boot.patch -Patch18: systemctl-completion-fix.patch Patch19: avoid-random-seed-cycle.patch Patch22: new-lsb-headers.patch Patch23: storage-after-cryptsetup.patch Patch24: delay-fsck-cryptsetup-after-md-lvm-dmraid.patch Patch31: lock-opensuse.patch Patch33: crypt-loop-file.patch +Patch36: sysctl-modules.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id # in the patch. Any patches added here without a very good reason to make # an exception will be silently removed with the next version update. -Patch20: crash-isolating.patch Patch21: no-tmpfs-fsck.patch -Patch25: cron-tty-pam.patch -Patch26: do_not_warn_pidfile.patch -Patch27: mount-swap-log.patch -Patch28: color-on-boot.patch -Patch29: log_on_close.patch -Patch30: handle-racy-daemon.patch -Patch32: garbage_collect_units.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -104,8 +102,8 @@ drop-in replacement for sysvinit. %package devel -Group: Development/Libraries/C and C++ Summary: Development headers for systemd +Group: Development/Libraries/C and C++ Requires: %{name} = %{version} Requires: pkg-config @@ -114,6 +112,7 @@ %package sysvinit Summary: System V init tools +Group: System/Base Requires: %{name} = %{version} Provides: sbin_init Conflicts: otherproviders(sbin_init) @@ -126,6 +125,7 @@ %package plymouth Summary: Plymouth support for systemd +Group: System/Base Requires: %{name} = %{version} Requires: plymouth @@ -142,22 +142,14 @@ %patch13 -p1 %patch15 -p1 %patch16 -p1 -%patch18 -p1 %patch19 -p1 -%patch20 -p1 %patch21 -p1 %patch22 -p1 %patch23 -p1 %patch24 -p1 -%patch25 -p1 -%patch26 -p1 -%patch27 -p1 -%patch28 -p1 -%patch29 -p1 -%patch30 -p1 %patch31 -p1 -%patch32 -p1 %patch33 -p1 +%patch36 -p1 %build autoreconf -fiv @@ -168,7 +160,8 @@ %configure \ --with-distro=suse \ --docdir=%{_docdir}/systemd \ - --with-rootdir= \ + --with-rootprefix= \ + --with-pamlibdir=/%{_lib}/security \ --disable-gtk \ CFLAGS="%{optflags}" make %{?_smp_mflags} @@ -231,10 +224,20 @@ ln -s /dev/null %{buildroot}/lib/systemd/system/earlyxdm.service ln -s systemd-sysctl.service %{buildroot}/lib/systemd/system/sysctl.service ln -s systemd-random-seed-load.service %{buildroot}/lib/systemd/system/random.service + +# Install rsyslog fragment +mkdir -p %{buildroot}%{_sysconfdir}/rsyslog.d/ +install -m 0644 %{SOURCE11} %{buildroot}%{_sysconfdir}/rsyslog.d/ + +# Create the /var/log/journal directory to change the volatile journal to a persistent one +mkdir -p %{buildroot}/var/log/journal + %if %{build_plymouth} (cd %{buildroot} && find . -name '*plymouth*') > files.plymouth %endif +%fdupes $RPM_BUILD_ROOT + %post /usr/sbin/pam-config -a --systemd >/dev/null 2>&1 || : /sbin/ldconfig @@ -286,6 +289,7 @@ /bin/systemd /bin/systemctl /bin/systemd-notify +/bin/systemd-journalctl /bin/systemd-ask-password /bin/systemd-loginctl /bin/systemd-tty-ask-password-agent @@ -297,7 +301,11 @@ %{_sbindir}/systemd-sysv-convert %{_libdir}/libsystemd-daemon.so.* %{_libdir}/libsystemd-login.so.* +%{_libdir}/libsystemd-id128.so.* +%{_libdir}/libsystemd-journal.so.* %{_bindir}/systemd-cgls +%{_bindir}/systemd-cgtop +%{_bindir}/systemd-cat /lib/systemd/systemd-* %dir /lib/systemd/system-shutdown %dir /lib/systemd/system.preset @@ -315,10 +323,13 @@ %dir /usr/lib/binfmt.d %dir %{_sysconfdir}/binfmt.d %dir /usr/lib/sysctl.d +/usr/lib/sysctl.d/coredump.conf %dir %{_sysconfdir}/sysctl.d +%dir %{_sysconfdir}/rsyslog.d /usr/lib/tmpfiles.d/*.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/systemd/systemd-logind.conf +%config(noreplace) %{_sysconfdir}/systemd/systemd-journald.conf %config(noreplace) %{_sysconfdir}/systemd/user.conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.locale1.conf @@ -326,6 +337,7 @@ %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.hostname1.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.timedate1.conf +%config(noreplace) %{_sysconfdir}/rsyslog.d/listen.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.hostname1.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.locale1.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml @@ -370,22 +382,30 @@ /usr/lib/systemd/user %dir %{_sysconfdir}/systemd %dir %{_sysconfdir}/bash_completion.d -/etc/bash_completion.d/systemctl-bash-completion.sh +/etc/bash_completion.d/systemd-bash-completion.sh /etc/rpm/macros.systemd %dir /var/lib/systemd %dir /var/lib/systemd/sysv-convert %dir /var/lib/systemd/migrated +%dir /var/log/journal %files devel %defattr(-,root,root,-) %{_libdir}/libsystemd-daemon.so %{_libdir}/libsystemd-login.so +%{_libdir}/libsystemd-id128.so +%{_libdir}/libsystemd-journal.so %dir %{_includedir}/systemd %{_includedir}/systemd/sd-login.h %{_includedir}/systemd/sd-daemon.h +%{_includedir}/systemd/sd-id128.h +%{_includedir}/systemd/sd-journal.h +%{_includedir}/systemd/sd-messages.h %{_datadir}/pkgconfig/systemd.pc %{_libdir}/pkgconfig/libsystemd-daemon.pc %{_libdir}/pkgconfig/libsystemd-login.pc +%{_libdir}/pkgconfig/libsystemd-id128.pc +%{_libdir}/pkgconfig/libsystemd-journal.pc %if %{build_plymouth} ++++++ 0001-handle-disable_caplock-and-compose_table-and-kbd_rat.patch ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -1,4 +1,4 @@ -From 5c894bc1e45f7c34bf7fc4ca0d20bf1c3b679bef Mon Sep 17 00:00:00 2001 +m 5c894bc1e45f7c34bf7fc4ca0d20bf1c3b679bef Mon Sep 17 00:00:00 2001 From: Frederic Crozat <fcro...@suse.com> Date: Thu, 18 Aug 2011 18:28:01 +0200 Subject: [PATCH] handle disable_caplock and compose_table and kbd_rate @@ -9,8 +9,8 @@ Index: systemd-37/src/vconsole-setup.c =================================================================== ---- systemd-37.orig/src/vconsole-setup.c -+++ systemd-37/src/vconsole-setup.c +--- systemd-37.orig/src/vconsole/vconsole-setup.c ++++ systemd-37/src/vconsole/vconsole-setup.c @@ -40,6 +40,7 @@ #include "log.h" #include "macro.h" @@ -19,7 +19,7 @@ static bool is_vconsole(int fd) { unsigned char data[1]; -@@ -79,8 +80,8 @@ static int disable_utf8(int fd) { +@@ -79,8 +80,8 @@ return r; } @@ -30,7 +30,7 @@ int i = 0; pid_t pid; -@@ -99,6 +100,8 @@ static int load_keymap(const char *vc, c +@@ -99,6 +100,8 @@ args[i++] = map; if (map_toggle) args[i++] = map_toggle; @@ -39,7 +39,7 @@ args[i++] = NULL; if ((pid = fork()) < 0) { -@@ -150,6 +153,101 @@ static int load_font(const char *vc, con +@@ -150,6 +153,101 @@ return 0; } @@ -141,8 +141,8 @@ int main(int argc, char **argv) { const char *vc; char *vc_keymap = NULL; -@@ -163,8 +261,16 @@ int main(int argc, char **argv) { - #ifdef TARGET_MANDRIVA +@@ -163,8 +261,16 @@ + #if defined(TARGET_MANDRIVA) || defined(TARGET_MAGEIA) char *vc_keytable = NULL; #endif +#ifdef TARGET_SUSE @@ -158,7 +158,7 @@ int r = EXIT_FAILURE; pid_t font_pid = 0, keymap_pid = 0; -@@ -265,6 +371,10 @@ int main(int argc, char **argv) { +@@ -265,6 +371,10 @@ #elif defined(TARGET_SUSE) if ((r = parse_env_file("/etc/sysconfig/keyboard", NEWLINE, "KEYTABLE", &vc_keymap, @@ -169,7 +169,7 @@ NULL)) < 0) { if (r != -ENOENT) -@@ -280,6 +390,7 @@ int main(int argc, char **argv) { +@@ -280,6 +390,7 @@ if (r != -ENOENT) log_warning("Failed to read /etc/sysconfig/console: %s", strerror(-r)); } @@ -177,7 +177,7 @@ #elif defined(TARGET_ARCH) if ((r = parse_env_file("/etc/rc.conf", NEWLINE, -@@ -436,7 +547,11 @@ int main(int argc, char **argv) { +@@ -436,7 +547,11 @@ if (!utf8) disable_utf8(fd); @@ -190,7 +190,7 @@ load_font(vc, vc_font, vc_font_map, vc_font_unimap, &font_pid) >= 0) r = EXIT_SUCCESS; -@@ -444,6 +559,14 @@ finish: +@@ -444,6 +559,14 @@ if (keymap_pid > 0) wait_for_terminate_and_warn(KBD_LOADKEYS, keymap_pid); @@ -205,7 +205,7 @@ if (font_pid > 0) wait_for_terminate_and_warn(KBD_SETFONT, font_pid); -@@ -451,6 +574,12 @@ finish: +@@ -451,6 +574,12 @@ free(vc_font); free(vc_font_map); free(vc_font_unimap); @@ -218,3 +218,4 @@ if (fd >= 0) close_nointr_nofail(fd); +Only in new/src/vconsole: vconsole-setup.c.orig ++++++ 0001-service-Fix-dependencies-added-when-parsing-insserv..patch ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -7,11 +7,15 @@ src/service.c | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) -diff --git a/src/service.c b/src/service.c -index c2053ce..4abc7e7 100644 ---- a/src/service.c -+++ b/src/service.c -@@ -3031,18 +3031,20 @@ static void sysv_facility_in_insserv_conf(Manager *mgr) { +Index: systemd-39/src/service.c +=================================================================== +--- systemd-39.orig/src/service.c ++++ systemd-39/src/service.c +@@ -3111,22 +3111,22 @@ static void sysv_facility_in_insserv_con + if (sysv_translate_facility(parsed[0], NULL, &facility) < 0) + continue; + if ((u = manager_get_unit(mgr, facility)) && (u->type == UNIT_TARGET)) { +- UnitDependency e; char *dep = NULL, *name, **j; STRV_FOREACH (j, parsed+1) { @@ -28,7 +32,6 @@ + if (streq(name, "boot.localfs") || + streq(name, "boot.crypto")) + continue; -+ if (sysv_translate_facility(name, NULL, &dep) < 0) continue; @@ -39,6 +42,3 @@ free(dep); } } --- -1.7.3.4 - ++++++ avoid-random-seed-cycle.patch ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -1,40 +1,109 @@ -Devices with random keys (swap), should not be ordered before local-fs.target, -as this creates a cycle with systemd-load-random-seed.service (and also it -does not make sense, a swap device is not a local-fs). +Rather than ordering systemd-random-seed-load.service after local-fs.target, +start it by path-activation. + +We need write access to the seed, so we order the path unit after +remount-rootfs.service (in case /var is on the root fs). + +A better solution might be to introduce PathIsWritable=, but that is not +necessary in order to solve the problem, and I don't know of any other +usecases for it. + +Cc: Frederic Crozat <fcro...@suse.com> +Cc: Michal Schmidt <mschm...@redhat.com> --- - src/cryptsetup-generator.c | 6 ++++-- - 1 files changed, 4 insertions(+), 2 deletions(-) -diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c -index 6f3aa78..a48b7a4 100644 ---- a/src/cryptsetup-generator.c -+++ b/src/cryptsetup-generator.c -@@ -112,8 +112,7 @@ static int create_disk( - "DefaultDependencies=no\n" - "BindTo=%s dev-mapper-%%i.device\n" - "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n" -- "Before=umount.target\n" -- "Before=local-fs.target\n", -+ "Before=umount.target\n", - d, d); - - if (!nofail) -@@ -125,6 +124,9 @@ static int create_disk( - streq(password, "/dev/hw_random"))) - fprintf(f, - "After=systemd-random-seed-load.service\n"); -+ else -+ fprintf(f, -+ "Before=local-fs.target\n"); +This is my second attempt at solving this problem. The first one had +some issues as pointed out by Frederic and Michael. + + Makefile.am | 7 +++++-- + TODO | 2 -- + units/.gitignore | 1 + + units/systemd-random-seed-load.path.in | 18 ++++++++++++++++++ + units/systemd-random-seed-load.service.in | 3 +-- + 5 files changed, 25 insertions(+), 6 deletions(-) + create mode 100644 units/systemd-random-seed-load.path.in + +diff -urB systemd-38/Makefile.am new/Makefile.am +--- systemd-38/Makefile.am 2012-01-11 04:01:36.734404653 +0100 ++++ new/Makefile.am 2012-01-18 09:53:12.763115731 +0100 +@@ -1530,11 +1530,14 @@ + + nodist_systemunit_DATA += \ + units/systemd-random-seed-save.service \ +- units/systemd-random-seed-load.service ++ units/systemd-random-seed-load.service \ ++ units/systemd-random-seed-load.path ++ - fprintf(f, - "\n[Service]\n" + EXTRA_DIST += \ + units/systemd-random-seed-save.service.in \ +- units/systemd-random-seed-load.service.in ++ units/systemd-random-seed-load.service.in \ ++ units/systemd-random-seed-load.path.in + + systemd_random_seed_SOURCES = \ + src/random-seed.c +@@ -1550,8 +1553,8 @@ + rm -f systemd-random-seed-save.service && \ + $(LN_S) ../systemd-random-seed-save.service systemd-random-seed-save.service ) + ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \ +- rm -f systemd-random-seed-load.service && \ +- $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service ) ++ rm -f systemd-random-seed-load.path && \ ++ $(LN_S) ../systemd-random-seed-load.path systemd-random-seed-load.path ) + + INSTALL_DATA_HOOKS += \ + randomseed-install-data-hook +@@ -2052,6 +2055,7 @@ + -e 's,@exec_prefix\@,$(exec_prefix),g' \ + -e 's,@libdir\@,$(libdir),g' \ + -e 's,@includedir\@,$(includedir),g' \ ++ -e 's,@localstatedir\@,$(localstatedir),g' \ + < $< > $@ || rm $@ + + units/%: units/%.in Makefile +diff --git a/units/systemd-random-seed-load.path.in b/units/systemd-random-seed-load.path.in +new file mode 100644 +index 0000000..614c1d4 +--- /dev/null ++++ b/units/systemd-random-seed-load.path.in +@@ -0,0 +1,18 @@ ++# This file is part of systemd. ++# ++# systemd is free software; you can redistribute it and/or modify it ++# under the terms of the GNU General Public License as published by ++# the Free Software Foundation; either version 2 of the License, or ++# (at your option) any later version. ++ ++[Unit] ++Description=Random Seed ++DefaultDependencies=no ++Conflicts=shutdown.target ++Before=basic.target shutdown.target ++# in case the seed is on the rootfs, we must ++# wait for the rootfs to be remonuted rw ++After=remount-rootfs.service ++ ++[Path] ++PathExists=@localstatedir@/lib/random-seed +diff --git a/units/systemd-random-seed-load.service.in b/units/systemd-random-seed-load.service.in +index a2b6a55..2bcf1aa 100644 +--- a/units/systemd-random-seed-load.service.in ++++ b/units/systemd-random-seed-load.service.in +@@ -8,9 +8,8 @@ + [Unit] + Description=Load Random Seed + DefaultDependencies=no +-Wants=local-fs.target + Conflicts=shutdown.target +-After=systemd-readahead-collect.service systemd-readahead-replay.service local-fs.target ++After=systemd-readahead-collect.service systemd-readahead-replay.service systemd-random-seed-load.path + Before=sysinit.target shutdown.target + + [Service] -- -1.7.7 +1.7.8 + -_______________________________________________ -systemd-devel mailing list -systemd-de...@lists.freedesktop.org -http://lists.freedesktop.org/mailman/listinfo/systemd-devel ++++++ crypt-loop-file.patch ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -1,7 +1,7 @@ -Index: systemd-37/src/cryptsetup-generator.c +Index: systemd-37/src/cryptsetup/cryptsetup-generator.c =================================================================== ---- systemd-37.orig/src/cryptsetup-generator.c -+++ systemd-37/src/cryptsetup-generator.c +--- systemd-37.orig/src/cryptsetup/cryptsetup-generator.c ++++ systemd-37/src/cryptsetup/cryptsetup-generator.c @@ -138,7 +138,7 @@ static int create_disk( const char *password, const char *options) { ++++++ delay-fsck-cryptsetup-after-md-lvm-dmraid.patch ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -8,11 +8,11 @@ units/f...@.service.in | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) -diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c -index 14fcce8..e62f0e0 100644 ---- a/src/cryptsetup-generator.c -+++ b/src/cryptsetup-generator.c -@@ -186,6 +186,7 @@ static int create_disk( +Index: systemd-37/src/cryptsetup/cryptsetup-generator.c +=================================================================== +--- systemd-37.orig/src/cryptsetup/cryptsetup-generator.c ++++ systemd-37/src/cryptsetup/cryptsetup-generator.c +@@ -112,6 +112,7 @@ static int create_disk( "DefaultDependencies=no\n" "BindTo=%s dev-mapper-%%i.device\n" "After=systemd-readahead-collect.service systemd-readahead-replay.service %s\n" @@ -20,10 +20,10 @@ "Before=umount.target\n", d, d); -diff --git a/units/f...@.service.in b/units/f...@.service.in -index e1f7736..c1870ce 100644 ---- a/units/f...@.service.in -+++ b/units/f...@.service.in +Index: systemd-37/units/f...@.service.in +=================================================================== +--- systemd-37.orig/units/f...@.service.in ++++ systemd-37/units/f...@.service.in @@ -9,7 +9,7 @@ Description=File System Check on %f DefaultDependencies=no @@ -33,6 +33,3 @@ Before=shutdown.target [Service] --- -1.7.7 - ++++++ listen.conf ++++++ $SystemLogSocketName /run/systemd/journal/syslog ++++++ no-tmpfs-fsck.patch ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -8,18 +8,15 @@ src/mount.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) -diff --git a/src/mount.c b/src/mount.c -index ef953f0..5da4047 100644 ---- a/src/mount.c -+++ b/src/mount.c -@@ -434,6 +434,7 @@ static int mount_add_device_links(Mount *m) { +Index: systemd-39/src/mount.c +=================================================================== +--- systemd-39.orig/src/mount.c ++++ systemd-39/src/mount.c +@@ -428,6 +428,7 @@ static int mount_add_device_links(Mount if (p->passno > 0 && !mount_is_bind(p) && + !streq(p->fstype,"tmpfs") && - UNIT(m)->meta.manager->running_as == MANAGER_SYSTEM && + UNIT(m)->manager->running_as == MANAGER_SYSTEM && !path_equal(m->where, "/")) { char *name; --- -1.7.7 - ++++++ storage-after-cryptsetup.patch ++++++ --- /var/tmp/diff_new_pack.FnotMK/_old 2012-01-26 16:00:52.000000000 +0100 +++ /var/tmp/diff_new_pack.FnotMK/_new 2012-01-26 16:00:52.000000000 +0100 @@ -7,11 +7,11 @@ src/cryptsetup-generator.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 80 insertions(+), 0 deletions(-) -diff --git a/src/cryptsetup-generator.c b/src/cryptsetup-generator.c -index a48b7a4..14fcce8 100644 ---- a/src/cryptsetup-generator.c -+++ b/src/cryptsetup-generator.c -@@ -22,12 +22,14 @@ +Index: systemd-37/src/cryptsetup/cryptsetup-generator.c +=================================================================== +--- systemd-37.orig/src/cryptsetup/cryptsetup-generator.c ++++ systemd-37/src/cryptsetup/cryptsetup-generator.c +@@ -22,6 +22,7 @@ #include <string.h> #include <errno.h> #include <unistd.h> @@ -19,14 +19,7 @@ #include "log.h" #include "util.h" - #include "unit-name.h" - - const char *arg_dest = "/tmp"; -+bool random_seed = false; - - static bool has_option(const char *haystack, const char *needle) { - const char *f = haystack; -@@ -58,6 +60,78 @@ static bool has_option(const char *haystack, const char *needle) { +@@ -58,6 +59,71 @@ static bool has_option(const char *hayst return false; } @@ -53,10 +46,8 @@ + "DefaultDependencies=no\n" + "After=cryptsetup.target\n" + "Wants=cryptsetup.target\n" ++ "Before=local-fs.target\n" + "Before=shutdown.target\n"); -+ if (!random_seed) { -+ fprintf(f, "After=local-fs.target\n"); -+ } + + fprintf(f, + "\n[Service]\n" @@ -86,13 +77,8 @@ + goto fail; + } + -+ free(to); -+ to = NULL; -+ -+ r = 0; -+ system ("TMPDIR=/run /usr/bin/sed -e 's/\\(After=.*\\) local-fs.target\\(.*\\)/\\1\\2/g' /lib/systemd/system/systemd-random-seed-load.service > /etc/systemd/system/systemd-random-seed-load.service "); ++ r=0; +fail: -+ + free(p); + free(to); + @@ -105,19 +91,7 @@ static int create_disk( const char *name, const char *device, -@@ -122,8 +196,11 @@ static int create_disk( - if (password && (streq(password, "/dev/urandom") || - streq(password, "/dev/random") || - streq(password, "/dev/hw_random"))) -+ { - fprintf(f, - "After=systemd-random-seed-load.service\n"); -+ random_seed = true; -+ } - else - fprintf(f, - "Before=local-fs.target\n"); -@@ -293,6 +370,9 @@ int main(int argc, char *argv[]) { +@@ -291,6 +357,9 @@ int main(int argc, char *argv[]) { free(options); } @@ -127,6 +101,3 @@ finish: return r; } --- -1.7.7 - ++++++ sysctl-modules.patch ++++++ Index: systemd-37/units/systemd-sysctl.service.in =================================================================== --- systemd-37.orig/units/systemd-sysctl.service.in +++ systemd-37/units/systemd-sysctl.service.in @@ -10,6 +10,7 @@ Description=Apply Kernel Variables DefaultDependencies=no Conflicts=shutdown.target After=systemd-readahead-collect.service systemd-readahead-replay.service +After=systemd-modules-load.service Before=sysinit.target shutdown.target ConditionPathExists=|/etc/sysctl.conf ConditionDirectoryNotEmpty=|/lib/sysctl.d -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
