diff --git a/systemd-28.tar.bz2 b/systemd-28.tar.bz2 index 3057c82..4c2dabb 100644 --- a/systemd-28.tar.bz2 +++ b/systemd-28.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:90691dd21bd9a296ec7cc2e6edaa5bc813c847b3219891afd9f38fb9696ddf70 -size 816801 +oid sha256:92e98fe32c7cff50933a3b865e28efba870fbacfa51cd58f2d13f117eb31a2c6 +size 816790 diff --git a/systemd.changes b/systemd.changes index 619a1e8..c89d091 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Tue Jun 14 15:10:41 CEST 2011 - kay.sievers@novell.com + +- new snapshot + - mount /run without MS_NOEXEC + - readahead-common: fix total memory size detection + - enable chkconfig support in systemctl for openSUSE + - selinux: selinuxfs can be mounted on /sys/fs/selinux + - cryptsetup-generator: fix /etc/cryptsetup options + - systemctl: fix double unref of a dbus message +- drop merged chkconfig patch + +------------------------------------------------------------------- +Tue Jun 14 12:39:25 UTC 2011 - fcrozat@novell.com + +- Add sysv chkconfig patch to be able to enable / disable sysv + initscripts with systemctl. +- Ensure plymouth support is buildable conditionnally. + ------------------------------------------------------------------- Thu May 26 21:16:06 CEST 2011 - kay.sievers@novell.com diff --git a/systemd.spec b/systemd.spec index f315f60..0f6a351 100644 --- a/systemd.spec +++ b/systemd.spec @@ -17,6 +17,7 @@ # norootforbuild +%define build_plymouth 0 Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd @@ -82,15 +83,17 @@ Conflicts: upstart %description sysvinit Drop-in replacement of System V init tools. -#%package plymouth -#License: GPLv2+ -#Group: System/Base -#Summary: Plymouth support for systemd -#Requires: %{name} = %{version}-%{release} -#Requires: plymouth -# -#%description plymouth -#Plymouth integration for systemd +%if %{build_plymouth} +%package plymouth +License: GPLv2+ +Group: System/Base +Summary: Plymouth support for systemd +Requires: %{name} = %{version}-%{release} +Requires: plymouth + +%description plymouth +Plymouth integration for systemd +%endif %prep %setup -q @@ -124,9 +127,11 @@ 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 +%if !%{build_plymouth} rm -f $RPM_BUILD_ROOT/lib/systemd/system/plymouth-*.service rm -f $RPM_BUILD_ROOT/lib/systemd/system/*.wants/plymouth-*.service rm -f $RPM_BUILD_ROOT/lib/systemd/system/systemd-ask-password-plymouth.* +%endif # aliases for /etc/init.d/* ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/cgroup.service ln -s systemd-tmpfiles-setup.service $RPM_BUILD_ROOT/lib/systemd/system/cleanup.service @@ -144,7 +149,9 @@ ln -s fsck-root.service $RPM_BUILD_ROOT/lib/systemd/system/rootfsck.service ln -s /dev/null $RPM_BUILD_ROOT/lib/systemd/system/swap.service ln -s systemd-sysctl.service $RPM_BUILD_ROOT/lib/systemd/system/sysctl.service ln -s systemd-random-seed-load.service $RPM_BUILD_ROOT/lib/systemd/system/random.service -#(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth +%if %{build_plymouth} +(cd $RPM_BUILD_ROOT && find . -name '*plymouth*') > files.plymouth +%endif %post /bin/systemd-machine-id-setup >/dev/null 2>&1 || : @@ -220,10 +227,12 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/polkit-1/actions %{_datadir}/polkit-1/actions/org.freedesktop.systemd1.policy %{_datadir}/pkgconfig/systemd.pc +%if %{build_plymouth} # Packaged in plymouth subpackage -#%exclude /lib/systemd/system/plymouth-*.service -#%exclude /lib/systemd/system/*.wants/plymouth-*.service -#%exclude /lib/systemd/system/systemd-ask-password-plymouth.* +%exclude /lib/systemd/system/plymouth-*.service +%exclude /lib/systemd/system/*.wants/plymouth-*.service +%exclude /lib/systemd/system/systemd-ask-password-plymouth.* +%endif # Packaged in gtk subpackage %exclude %{_mandir}/man1/systemadm.1* # Packaged in sysvinit subpackage @@ -256,11 +265,13 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/systemd-gnome-ask-password-agent %{_mandir}/man1/systemadm.1* -#%files plymouth -#%defattr(-,root,root,-) -#/lib/systemd/system/plymouth-*.service -#/lib/systemd/system/*.wants/plymouth-*.service -#/lib/systemd/system/systemd-ask-password-plymouth.* +%if %{build_plymouth} +%files plymouth +%defattr(-,root,root,-) +/lib/systemd/system/plymouth-*.service +/lib/systemd/system/*.wants/plymouth-*.service +/lib/systemd/system/systemd-ask-password-plymouth.* +%endif %files sysvinit %defattr(-,root,root,-)