From 6fc023e71c4035dccbb11b16d73a37f3b0b9f5c39a3fdc9561766645c3ca7492 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 3 Oct 2010 13:25:05 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=66 --- systemd.changes | 6 ++++++ systemd.spec | 9 +++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/systemd.changes b/systemd.changes index e63e2de..9057cb9 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Oct 3 08:08:13 UTC 2010 - aj@suse.de + +- /etc/modules.d was renamed to modules.load.d +- only include tmpfiles.d/*conf files + ------------------------------------------------------------------- Wed Sep 29 11:55:11 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index 079cc63..ceb9721 100644 --- a/systemd.spec +++ b/systemd.spec @@ -21,7 +21,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 10 -Release: 1 +Release: 2 License: GPLv2+ Group: System/Base Summary: A System and Session Manager @@ -102,7 +102,7 @@ ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/telinit ln -s ../bin/systemctl $RPM_BUILD_ROOT/sbin/runlevel rm -rf $RPM_BUILD_ROOT/etc/systemd/system/*.target.wants rm -f $RPM_BUILD_ROOT/etc/systemd/system/default.target -mkdir -p $RPM_BUILD_ROOT/etc/modules.d +mkdir -p $RPM_BUILD_ROOT/etc/modules.load.d # alias for /etc/init.d/* ln -s hwclock-load.service $RPM_BUILD_ROOT/lib/systemd/system/clock.service ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random.service @@ -147,8 +147,9 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/session %dir %{_sysconfdir}/xdg/systemd/session -%dir %{_sysconfdir}/modules.d -%{_sysconfdir}/tmpfiles.d +%dir %{_sysconfdir}/modules.load.d +%dir %{_sysconfdir}/tmpfiles.d +%{_sysconfdir}/tmpfiles.d/*conf %config(noreplace) %{_sysconfdir}/systemd/system.conf %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml