From 75d890f7ad7c0a76ab70a5af7ac8c45ae080bcc73a764ed08c9e1ed0c496af45 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 14 Sep 2010 09:09:10 +0000 Subject: [PATCH 1/6] version 10 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=60 --- systemd-10.tar.bz2 | 3 +++ systemd-9.tar.bz2 | 3 --- systemd.spec | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) create mode 100644 systemd-10.tar.bz2 delete mode 100644 systemd-9.tar.bz2 diff --git a/systemd-10.tar.bz2 b/systemd-10.tar.bz2 new file mode 100644 index 00000000..f72cff38 --- /dev/null +++ b/systemd-10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d119a3e541eaf72f78d12e0a4624a6128308fbde0f01005523a57f3ff8da11a5 +size 669130 diff --git a/systemd-9.tar.bz2 b/systemd-9.tar.bz2 deleted file mode 100644 index dc66f76c..00000000 --- a/systemd-9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31323d052daff12e86b9971b2ecd20c12f4ac41ed04ee11a1eb2686a2c9bb313 -size 666685 diff --git a/systemd.spec b/systemd.spec index 6da472fa..28ee4d4c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 9 +Version: 10 Release: 1 License: GPLv2+ Group: System/Base From a70670810d6d5c00ceac99f166095b028589d66709dda7728211cfdff720d475 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Fri, 17 Sep 2010 08:59:08 +0000 Subject: [PATCH 2/6] update OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=61 --- systemd-10.tar.bz2 | 4 ++-- systemd.changes | 21 +++++++++++++++++++++ systemd.spec | 5 ++++- 3 files changed, 27 insertions(+), 3 deletions(-) diff --git a/systemd-10.tar.bz2 b/systemd-10.tar.bz2 index f72cff38..7dea73e7 100644 --- a/systemd-10.tar.bz2 +++ b/systemd-10.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d119a3e541eaf72f78d12e0a4624a6128308fbde0f01005523a57f3ff8da11a5 -size 669130 +oid sha256:be67ba1aa0e4c24ea0b9af9a4b9a6edf8e1f339ff039c11f392799167619dc90 +size 678772 diff --git a/systemd.changes b/systemd.changes index 8af63d2d..01c5b92b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,24 @@ +------------------------------------------------------------------- +Fri Sep 17 10:58:24 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - add new utility to initialize the virtual console + - initialize locale from /etc/locale by default + - ask-password: allow services query SSL/harddisk passphrases + +------------------------------------------------------------------- +Fri Sep 17 10:54:24 CEST 2010 - kay.sievers@novell.com + +- version 10 + - logger: support SOCK_STREAM /dev/log sockets + - make sure the file system is writable before we write utmp data + - systemctl: use isolate when called as telinit for a runlevel + - initctl: properly use isolate when activating runlevels + - set HOME=/root when running shells + - make sure we don't crash if there's an automount unit without + mount unit + - start logger only after syslog is up + ------------------------------------------------------------------- Fri Sep 3 11:52:42 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index 28ee4d4c..32c7cbf6 100644 --- a/systemd.spec +++ b/systemd.spec @@ -32,7 +32,7 @@ BuildRequires: libcap-devel BuildRequires: tcpd-devel BuildRequires: pam-devel BuildRequires: pkg-config -BuildRequires: dbus-1-glib-devel gtk2-devel +BuildRequires: dbus-1-glib-devel gtk2-devel libnotify-devel BuildRequires: libselinux-devel libsepol-devel Requires: udev >= 162 Requires: dbus-1 >= 1.4.0 @@ -156,6 +156,7 @@ rm -rf $RPM_BUILD_ROOT /bin/systemd /bin/systemctl /bin/systemd-notify +/bin/systemd-ask-password %{_bindir}/systemd-cgls /lib/systemd/systemd-* /%{_lib}/security/pam_systemd.so @@ -170,6 +171,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service +%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/systemd %{_datadir}/pkgconfig/systemd.pc %{_mandir}/man1/*.1* @@ -186,6 +188,7 @@ rm -rf $RPM_BUILD_ROOT %files gtk %defattr(-,root,root,-) %{_bindir}/systemadm +%{_bindir}/systemd-ask-password-agent %{_mandir}/man1/systemadm.1* %files sysvinit From 16e552933a8a494300c164edbfee461bb4183ff1736faf52cf6d16fd2cccc8fd Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Wed, 22 Sep 2010 12:27:25 +0000 Subject: [PATCH 3/6] update OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=62 --- systemd-10.tar.bz2 | 4 ++-- systemd.changes | 13 +++++++++++++ systemd.spec | 32 +++++++------------------------- 3 files changed, 22 insertions(+), 27 deletions(-) diff --git a/systemd-10.tar.bz2 b/systemd-10.tar.bz2 index 7dea73e7..7b9bf091 100644 --- a/systemd-10.tar.bz2 +++ b/systemd-10.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:be67ba1aa0e4c24ea0b9af9a4b9a6edf8e1f339ff039c11f392799167619dc90 -size 678772 +oid sha256:dde1144e7ac56da7c022dd1aefe3587c70e92fe8c393039cbf1f02269f8f2265 +size 680700 diff --git a/systemd.changes b/systemd.changes index 01c5b92b..3b8e002a 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Wed Sep 22 11:40:02 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - basic services are enabled by default now + +------------------------------------------------------------------- +Tue Sep 21 14:39:02 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - vconsole and locale setup + - hook up tmpwatch + ------------------------------------------------------------------- Fri Sep 17 10:58:24 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index 32c7cbf6..d8c677d2 100644 --- a/systemd.spec +++ b/systemd.spec @@ -36,6 +36,9 @@ BuildRequires: dbus-1-glib-devel gtk2-devel libnotify-devel BuildRequires: libselinux-devel libsepol-devel Requires: udev >= 162 Requires: dbus-1 >= 1.4.0 +Requires: kbd +Requires: util-linux +Requires: tmpwatch Conflicts: mkinitrd < 2.6.0-5 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc @@ -112,39 +115,20 @@ ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random if [ "$1" -eq 1 ]; then # Try to read default runlevel from the old inittab if it exists runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null) - if [ -z "$runlevel" ] ; then - target="/lib/systemd/system/graphical.target" - else - target="/lib/systemd/system/runlevel$runlevel.target" + if [ -n "$runlevel" ] ; then + /bin/ln -sf /lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target 2>&1 || : fi - /bin/ln -sf "$target" /etc/systemd/system/default.target 2>&1 || : # Enable these services by default. /bin/systemctl enable \ getty@.service \ - getty.target \ - remote-fs.target \ - hwclock-save.service \ - sysctl.service \ - systemd-random-seed-load.service \ - systemd-random-seed-save.service \ - systemd-modules-load.service \ - var-run.service \ - var-lock.service >/dev/null 2>&1 || : + remote-fs.target >/dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ]; then /bin/systemctl disable \ getty@.service \ - getty.target \ - remote-fs.target \ - hwclock-save.service \ - sysctl.service \ - systemd-random-seed-load.service \ - systemd-random-seed-save.service \ - systemd-modules-load.service \ - var-run.service \ - var-lock.service >/dev/null 2>&1 || : + remote-fs.target >/dev/null 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || : fi @@ -165,8 +149,6 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/xdg/systemd/session %dir %{_sysconfdir}/modules.d %config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/system/ctrl-alt-del.target -%config(noreplace) %{_sysconfdir}/systemd/system/kbrequest.target %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service From 9ffb2747b6d6485717f9f44c8a057249543867c26031e81472a3446e7616be92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Sun, 26 Sep 2010 21:20:23 +0000 Subject: [PATCH 4/6] Accepting request 49130 from home:a_jaeger:branches:openSUSE:Factory OBS-URL: https://build.opensuse.org/request/show/49130 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=63 --- systemd.changes | 5 +++++ systemd.spec | 10 ++++++++++ 2 files changed, 15 insertions(+) diff --git a/systemd.changes b/systemd.changes index 3b8e002a..c5ba6a82 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Sep 26 20:39:53 UTC 2010 - aj@suse.de + +- Do not package man pages twice. + ------------------------------------------------------------------- Wed Sep 22 11:40:02 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index d8c677d2..f7ed1e7e 100644 --- a/systemd.spec +++ b/systemd.spec @@ -156,6 +156,16 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/systemd %{_datadir}/pkgconfig/systemd.pc +# Packaged in gtk subpackage +%exclude %{_mandir}/man1/systemadm.1* +# Packaged in sysvinit subpackage +%exclude %{_mandir}/man1/init.1* +%exclude %{_mandir}/man8/halt.8* +%exclude %{_mandir}/man8/reboot.8* +%exclude %{_mandir}/man8/shutdown.8* +%exclude %{_mandir}/man8/poweroff.8* +%exclude %{_mandir}/man8/telinit.8* +%exclude %{_mandir}/man8/runlevel.8* %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* From e458cb0a7db53f3fd94ab16baee0f703f4b782bba689f43448c1863a910b050f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Sun, 26 Sep 2010 22:49:24 +0000 Subject: [PATCH 5/6] Accepting request 49131 from Base:System checked in (request 49131) OBS-URL: https://build.opensuse.org/request/show/49131 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=64 --- systemd-10.tar.bz2 | 3 --- systemd-9.tar.bz2 | 3 +++ systemd.changes | 39 ------------------------------------ systemd.spec | 49 +++++++++++++++++++++++++--------------------- 4 files changed, 30 insertions(+), 64 deletions(-) delete mode 100644 systemd-10.tar.bz2 create mode 100644 systemd-9.tar.bz2 diff --git a/systemd-10.tar.bz2 b/systemd-10.tar.bz2 deleted file mode 100644 index 7b9bf091..00000000 --- a/systemd-10.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:dde1144e7ac56da7c022dd1aefe3587c70e92fe8c393039cbf1f02269f8f2265 -size 680700 diff --git a/systemd-9.tar.bz2 b/systemd-9.tar.bz2 new file mode 100644 index 00000000..dc66f76c --- /dev/null +++ b/systemd-9.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:31323d052daff12e86b9971b2ecd20c12f4ac41ed04ee11a1eb2686a2c9bb313 +size 666685 diff --git a/systemd.changes b/systemd.changes index c5ba6a82..8af63d2d 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,42 +1,3 @@ -------------------------------------------------------------------- -Sun Sep 26 20:39:53 UTC 2010 - aj@suse.de - -- Do not package man pages twice. - -------------------------------------------------------------------- -Wed Sep 22 11:40:02 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - basic services are enabled by default now - -------------------------------------------------------------------- -Tue Sep 21 14:39:02 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - vconsole and locale setup - - hook up tmpwatch - -------------------------------------------------------------------- -Fri Sep 17 10:58:24 CEST 2010 - kay.sievers@novell.com - -- new snapshot - - add new utility to initialize the virtual console - - initialize locale from /etc/locale by default - - ask-password: allow services query SSL/harddisk passphrases - -------------------------------------------------------------------- -Fri Sep 17 10:54:24 CEST 2010 - kay.sievers@novell.com - -- version 10 - - logger: support SOCK_STREAM /dev/log sockets - - make sure the file system is writable before we write utmp data - - systemctl: use isolate when called as telinit for a runlevel - - initctl: properly use isolate when activating runlevels - - set HOME=/root when running shells - - make sure we don't crash if there's an automount unit without - mount unit - - start logger only after syslog is up - ------------------------------------------------------------------- Fri Sep 3 11:52:42 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index f7ed1e7e..6da472fa 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 10 +Version: 9 Release: 1 License: GPLv2+ Group: System/Base @@ -32,13 +32,10 @@ BuildRequires: libcap-devel BuildRequires: tcpd-devel BuildRequires: pam-devel BuildRequires: pkg-config -BuildRequires: dbus-1-glib-devel gtk2-devel libnotify-devel +BuildRequires: dbus-1-glib-devel gtk2-devel BuildRequires: libselinux-devel libsepol-devel Requires: udev >= 162 Requires: dbus-1 >= 1.4.0 -Requires: kbd -Requires: util-linux -Requires: tmpwatch Conflicts: mkinitrd < 2.6.0-5 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc @@ -115,20 +112,39 @@ ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random if [ "$1" -eq 1 ]; then # Try to read default runlevel from the old inittab if it exists runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null) - if [ -n "$runlevel" ] ; then - /bin/ln -sf /lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target 2>&1 || : + if [ -z "$runlevel" ] ; then + target="/lib/systemd/system/graphical.target" + else + target="/lib/systemd/system/runlevel$runlevel.target" fi + /bin/ln -sf "$target" /etc/systemd/system/default.target 2>&1 || : # Enable these services by default. /bin/systemctl enable \ getty@.service \ - remote-fs.target >/dev/null 2>&1 || : + getty.target \ + remote-fs.target \ + hwclock-save.service \ + sysctl.service \ + systemd-random-seed-load.service \ + systemd-random-seed-save.service \ + systemd-modules-load.service \ + var-run.service \ + var-lock.service >/dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ]; then /bin/systemctl disable \ getty@.service \ - remote-fs.target >/dev/null 2>&1 || : + getty.target \ + remote-fs.target \ + hwclock-save.service \ + sysctl.service \ + systemd-random-seed-load.service \ + systemd-random-seed-save.service \ + systemd-modules-load.service \ + var-run.service \ + var-lock.service >/dev/null 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || : fi @@ -140,7 +156,6 @@ rm -rf $RPM_BUILD_ROOT /bin/systemd /bin/systemctl /bin/systemd-notify -/bin/systemd-ask-password %{_bindir}/systemd-cgls /lib/systemd/systemd-* /%{_lib}/security/pam_systemd.so @@ -149,23 +164,14 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/xdg/systemd/session %dir %{_sysconfdir}/modules.d %config(noreplace) %{_sysconfdir}/systemd/system.conf +%config(noreplace) %{_sysconfdir}/systemd/system/ctrl-alt-del.target +%config(noreplace) %{_sysconfdir}/systemd/system/kbrequest.target %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service -%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/systemd %{_datadir}/pkgconfig/systemd.pc -# Packaged in gtk subpackage -%exclude %{_mandir}/man1/systemadm.1* -# Packaged in sysvinit subpackage -%exclude %{_mandir}/man1/init.1* -%exclude %{_mandir}/man8/halt.8* -%exclude %{_mandir}/man8/reboot.8* -%exclude %{_mandir}/man8/shutdown.8* -%exclude %{_mandir}/man8/poweroff.8* -%exclude %{_mandir}/man8/telinit.8* -%exclude %{_mandir}/man8/runlevel.8* %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -180,7 +186,6 @@ rm -rf $RPM_BUILD_ROOT %files gtk %defattr(-,root,root,-) %{_bindir}/systemadm -%{_bindir}/systemd-ask-password-agent %{_mandir}/man1/systemadm.1* %files sysvinit From 84677d9d7a17f4dcaf3e14b7afe6f5f251785c88c5d9fa17ae2d21040b1e5c10 Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Sun, 26 Sep 2010 22:49:25 +0000 Subject: [PATCH 6/6] Updating link to change in openSUSE:Factory/systemd revision 6.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=9be1d29ab21fddfc9a76a51ef58ec696 --- systemd-10.tar.bz2 | 3 +++ systemd-9.tar.bz2 | 3 --- systemd.changes | 39 +++++++++++++++++++++++++++++++++++ systemd.spec | 51 +++++++++++++++++++++------------------------- 4 files changed, 65 insertions(+), 31 deletions(-) create mode 100644 systemd-10.tar.bz2 delete mode 100644 systemd-9.tar.bz2 diff --git a/systemd-10.tar.bz2 b/systemd-10.tar.bz2 new file mode 100644 index 00000000..7b9bf091 --- /dev/null +++ b/systemd-10.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:dde1144e7ac56da7c022dd1aefe3587c70e92fe8c393039cbf1f02269f8f2265 +size 680700 diff --git a/systemd-9.tar.bz2 b/systemd-9.tar.bz2 deleted file mode 100644 index dc66f76c..00000000 --- a/systemd-9.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:31323d052daff12e86b9971b2ecd20c12f4ac41ed04ee11a1eb2686a2c9bb313 -size 666685 diff --git a/systemd.changes b/systemd.changes index 8af63d2d..c5ba6a82 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,42 @@ +------------------------------------------------------------------- +Sun Sep 26 20:39:53 UTC 2010 - aj@suse.de + +- Do not package man pages twice. + +------------------------------------------------------------------- +Wed Sep 22 11:40:02 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - basic services are enabled by default now + +------------------------------------------------------------------- +Tue Sep 21 14:39:02 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - vconsole and locale setup + - hook up tmpwatch + +------------------------------------------------------------------- +Fri Sep 17 10:58:24 CEST 2010 - kay.sievers@novell.com + +- new snapshot + - add new utility to initialize the virtual console + - initialize locale from /etc/locale by default + - ask-password: allow services query SSL/harddisk passphrases + +------------------------------------------------------------------- +Fri Sep 17 10:54:24 CEST 2010 - kay.sievers@novell.com + +- version 10 + - logger: support SOCK_STREAM /dev/log sockets + - make sure the file system is writable before we write utmp data + - systemctl: use isolate when called as telinit for a runlevel + - initctl: properly use isolate when activating runlevels + - set HOME=/root when running shells + - make sure we don't crash if there's an automount unit without + mount unit + - start logger only after syslog is up + ------------------------------------------------------------------- Fri Sep 3 11:52:42 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index 6da472fa..17c2231c 100644 --- a/systemd.spec +++ b/systemd.spec @@ -1,5 +1,5 @@ # -# spec file for package systemd (Version 9) +# spec file for package systemd (Version 10) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -20,7 +20,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 9 +Version: 10 Release: 1 License: GPLv2+ Group: System/Base @@ -32,10 +32,13 @@ BuildRequires: libcap-devel BuildRequires: tcpd-devel BuildRequires: pam-devel BuildRequires: pkg-config -BuildRequires: dbus-1-glib-devel gtk2-devel +BuildRequires: dbus-1-glib-devel gtk2-devel libnotify-devel BuildRequires: libselinux-devel libsepol-devel Requires: udev >= 162 Requires: dbus-1 >= 1.4.0 +Requires: kbd +Requires: util-linux +Requires: tmpwatch Conflicts: mkinitrd < 2.6.0-5 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc @@ -112,39 +115,20 @@ ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random if [ "$1" -eq 1 ]; then # Try to read default runlevel from the old inittab if it exists runlevel=$(awk -F ':' '$3 == "initdefault" && $1 !~ "^#" { print $2 }' /etc/inittab 2> /dev/null) - if [ -z "$runlevel" ] ; then - target="/lib/systemd/system/graphical.target" - else - target="/lib/systemd/system/runlevel$runlevel.target" + if [ -n "$runlevel" ] ; then + /bin/ln -sf /lib/systemd/system/runlevel$runlevel.target /etc/systemd/system/default.target 2>&1 || : fi - /bin/ln -sf "$target" /etc/systemd/system/default.target 2>&1 || : # Enable these services by default. /bin/systemctl enable \ getty@.service \ - getty.target \ - remote-fs.target \ - hwclock-save.service \ - sysctl.service \ - systemd-random-seed-load.service \ - systemd-random-seed-save.service \ - systemd-modules-load.service \ - var-run.service \ - var-lock.service >/dev/null 2>&1 || : + remote-fs.target >/dev/null 2>&1 || : fi %preun if [ $1 -eq 0 ]; then /bin/systemctl disable \ getty@.service \ - getty.target \ - remote-fs.target \ - hwclock-save.service \ - sysctl.service \ - systemd-random-seed-load.service \ - systemd-random-seed-save.service \ - systemd-modules-load.service \ - var-run.service \ - var-lock.service >/dev/null 2>&1 || : + remote-fs.target >/dev/null 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || : fi @@ -156,6 +140,7 @@ rm -rf $RPM_BUILD_ROOT /bin/systemd /bin/systemctl /bin/systemd-notify +/bin/systemd-ask-password %{_bindir}/systemd-cgls /lib/systemd/systemd-* /%{_lib}/security/pam_systemd.so @@ -164,14 +149,23 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/xdg/systemd/session %dir %{_sysconfdir}/modules.d %config(noreplace) %{_sysconfdir}/systemd/system.conf -%config(noreplace) %{_sysconfdir}/systemd/system/ctrl-alt-del.target -%config(noreplace) %{_sysconfdir}/systemd/system/kbrequest.target %config(noreplace) %{_sysconfdir}/dbus-1/system.d/org.freedesktop.systemd1.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.systemd1.*.xml %{_datadir}/dbus-1/services/org.freedesktop.systemd1.service %{_datadir}/dbus-1/system-services/org.freedesktop.systemd1.service +%{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/systemd %{_datadir}/pkgconfig/systemd.pc +# Packaged in gtk subpackage +%exclude %{_mandir}/man1/systemadm.1* +# Packaged in sysvinit subpackage +%exclude %{_mandir}/man1/init.1* +%exclude %{_mandir}/man8/halt.8* +%exclude %{_mandir}/man8/reboot.8* +%exclude %{_mandir}/man8/shutdown.8* +%exclude %{_mandir}/man8/poweroff.8* +%exclude %{_mandir}/man8/telinit.8* +%exclude %{_mandir}/man8/runlevel.8* %{_mandir}/man1/*.1* %{_mandir}/man3/*.3* %{_mandir}/man5/*.5* @@ -186,6 +180,7 @@ rm -rf $RPM_BUILD_ROOT %files gtk %defattr(-,root,root,-) %{_bindir}/systemadm +%{_bindir}/systemd-ask-password-agent %{_mandir}/man1/systemadm.1* %files sysvinit