From ba05fc614e4c49dc08e34e40af8e5a00824c2e12a1455276a4874c3a63ea05b8 Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Fri, 10 Sep 2010 14:07:55 +0000 Subject: [PATCH] Accepting request 47338 from Base:System checked in (request 47338) OBS-URL: https://build.opensuse.org/request/show/47338 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=59 --- systemd-7.tar.bz2 | 3 +++ systemd-9.tar.bz2 | 3 --- systemd.changes | 52 -------------------------------------- systemd.spec | 64 ++++++++++++++++++++++------------------------- 4 files changed, 33 insertions(+), 89 deletions(-) create mode 100644 systemd-7.tar.bz2 delete mode 100644 systemd-9.tar.bz2 diff --git a/systemd-7.tar.bz2 b/systemd-7.tar.bz2 new file mode 100644 index 00000000..edfd95d3 --- /dev/null +++ b/systemd-7.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:951cb958080e24b211d4f24d6bf78358295bfda69d5ab301e94c3ccd8f1b90c1 +size 644164 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..8e7f8b69 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,55 +1,3 @@ -------------------------------------------------------------------- -Fri Sep 3 11:52:42 CEST 2010 - kay.sievers@novell.com - -- version 9 - - units: don't add shutdown conflicts dep to umount.target - - dbus: don't send cgroup agent messages directly to system bus - - dbus: don't accept activation requests anymore if we are going - down anyway - - systemctl: fix return value of systemctl start and friends - - service: wait for process exit only if we actually killed - somebody - -------------------------------------------------------------------- -Thu Aug 26 22:14:04 CEST 2010 - kay.sievers@novell.com - -- version 8 - - KERNEL 2.6.36+ REQUIRED! - - mount cgroup file systems to /sys/fs/cgroup instead of /cgroup - - invoke sulogin instead of /bin/sh - - systemctl: show timestamps for state changes - - add global configuration options for handling of auto mounts - -------------------------------------------------------------------- -Fri Aug 20 06:51:26 CEST 2010 - kay.sievers@novell.com - -- apply /etc/fstab mount options to all api mounts -- properly handle LABEL="" in fstab -- do not consider LSB exit codes 5 and 6 as failure - -------------------------------------------------------------------- -Tue Aug 17 22:54:41 CEST 2010 - kay.sievers@novell.com - -- prefix sysv job descriptions with LSB: -- add native sysctl + hwclock + random seed service files -- properly fallback to rescue.target if default.target is hosed -- rename ValidNoProcess= to RemainAfterExit= -- add systemd-modules-load tool to handle /etc/modules.d/ - -------------------------------------------------------------------- -Tue Aug 17 09:01:04 CEST 2010 - kay.sievers@novell.com - -- add support for delayed shutdown, similar to sysv in style -- rename Type=finish to Type=oneshot and allow multiple ExecStart= -- don't show ENOENT for non exitent configuration files -- log build time features on startup -- rearrange structs to make them smaller -- move runlevel[2-5] links to /lib -- create default.target link to /lib not /etc -- handle random-seed -- write utmp record before we kill all processes -- create /var/lock/subsys, /var/run/utmp - ------------------------------------------------------------------- Wed Aug 11 11:29:17 CEST 2010 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index 1b7aa96e..763d3667 100644 --- a/systemd.spec +++ b/systemd.spec @@ -20,7 +20,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd -Version: 9 +Version: 7 Release: 1 License: GPLv2+ Group: System/Base @@ -34,8 +34,8 @@ BuildRequires: pam-devel BuildRequires: pkg-config BuildRequires: dbus-1-glib-devel gtk2-devel BuildRequires: libselinux-devel libsepol-devel -Requires: udev >= 162 -Requires: dbus-1 >= 1.4.0 +Requires: udev >= 160 +Requires: dbus-1 >= 1.3.2 Conflicts: mkinitrd < 2.6.0-5 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc @@ -99,14 +99,12 @@ 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 -# 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 + +%pre +# kernel changes are pending to move this to /sys/fs/cgroup +mkdir -p -m 0755 /cgroup || : %post -/bin/systemctl daemon-reexec >/dev/null 2>&1 || : - # Create default config in /etc at first install. # Later package updates should not overwrite these settings. if [ "$1" -eq 1 ]; then @@ -115,36 +113,31 @@ if [ "$1" -eq 1 ]; then if [ -z "$runlevel" ] ; then target="/lib/systemd/system/graphical.target" else - target="/lib/systemd/system/runlevel$runlevel.target" + target="/etc/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 \ - 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 || : + # Enable the services we install by default. + /bin/systemctl enable getty@.service >/dev/null 2>&1 || : + /bin/systemctl enable getty.target >/dev/null 2>&1 || : + /bin/systemctl enable remote-fs.target >/dev/null 2>&1 || : + /bin/systemctl enable var-run.mount >/dev/null 2>&1 || : + /bin/systemctl enable var-lock.mount >/dev/null 2>&1 || : fi +# Make sure we always enable these basic services, in case something went +# wrong at the time these packages got installed. Usual systems can not +# properly work without these services. +/bin/systemctl enable udev.service >/dev/null 2>&1 || : +/bin/systemctl enable dbus.service >/dev/null 2>&1 || : +# temporary fix +/bin/systemctl enable getty.target >/dev/null 2>&1 || : %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 || : + /bin/systemctl disable getty@.service >/dev/null 2>&1 || : + /bin/systemctl disable getty.target >/dev/null 2>&1 || : + /bin/systemctl disable remote-fs.target >/dev/null 2>&1 || : + /bin/systemctl disable var-run.mount >/dev/null 2>&1 || : + /bin/systemctl disable var-lock.mount >/dev/null 2>&1 || : rm -f /etc/systemd/system/default.target 2>&1 || : fi @@ -162,10 +155,13 @@ rm -rf $RPM_BUILD_ROOT %dir %{_sysconfdir}/systemd/system %dir %{_sysconfdir}/systemd/session %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}/systemd/system/runlevel2.target +%config(noreplace) %{_sysconfdir}/systemd/system/runlevel3.target +%config(noreplace) %{_sysconfdir}/systemd/system/runlevel4.target +%config(noreplace) %{_sysconfdir}/systemd/system/runlevel5.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