From 06e76e9039f3d9a7befbf570abc128c7df31feca7633b2c5463e41b63117bbfd Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 14 Jun 2011 12:55:02 +0000 Subject: [PATCH 1/2] Accepting request 73517 from home:fcrozat:systemd - Add sysv chkconfig patch to be able to enable / disable sysv initscripts with systemctl. - Ensure plymouth support is buildable conditionnally. OBS-URL: https://build.opensuse.org/request/show/73517 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=152 --- ...-sysv-chkconfig-handling-for-openSUS.patch | 25 ++++++++++ systemd.changes | 7 +++ systemd.spec | 49 ++++++++++++------- 3 files changed, 63 insertions(+), 18 deletions(-) create mode 100644 0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch diff --git a/0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch b/0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch new file mode 100644 index 00000000..4ff0fed8 --- /dev/null +++ b/0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch @@ -0,0 +1,25 @@ +From ea4192a54fdbfebdec80f445d702625bc3412d7e Mon Sep 17 00:00:00 2001 +From: Frederic Crozat +Date: Wed, 8 Jun 2011 15:30:55 +0200 +Subject: [PATCH] systemctl: enable sysv chkconfig handling for openSUSE. + +--- + src/systemctl.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/src/systemctl.c b/src/systemctl.c +index a82cce4..faca797 100644 +--- a/src/systemctl.c ++++ b/src/systemctl.c +@@ -4089,7 +4089,7 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo + } + + if (!f) { +-#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)) || defined(TARGET_MEEGO) && defined (HAVE_SYSV_COMPAT) ++#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE)) || defined(TARGET_MEEGO) && defined (HAVE_SYSV_COMPAT) + + if (endswith(i->name, ".service")) { + char *sysv; +-- +1.7.3.4 + diff --git a/systemd.changes b/systemd.changes index 619a1e8e..1bd2751b 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +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 f315f60d..5339c7aa 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 @@ -45,6 +46,7 @@ Conflicts: mkinitrd < 2.7.0 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch +Patch2: 0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -82,19 +84,22 @@ 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 %patch1 -p1 +%patch2 -p1 %build autoreconf -fiv @@ -124,9 +129,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 +151,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 +229,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 +267,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,-) From 6e94c0b6a2fbb2d204515a309103bbf9ef73607d400dda3f6574fd1e044f6184 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 14 Jun 2011 13:26:41 +0000 Subject: [PATCH 2/2] update OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=153 --- ...-sysv-chkconfig-handling-for-openSUS.patch | 25 ------------------- systemd-28.tar.bz2 | 4 +-- systemd.changes | 12 +++++++++ systemd.spec | 2 -- 4 files changed, 14 insertions(+), 29 deletions(-) delete mode 100644 0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch diff --git a/0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch b/0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch deleted file mode 100644 index 4ff0fed8..00000000 --- a/0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch +++ /dev/null @@ -1,25 +0,0 @@ -From ea4192a54fdbfebdec80f445d702625bc3412d7e Mon Sep 17 00:00:00 2001 -From: Frederic Crozat -Date: Wed, 8 Jun 2011 15:30:55 +0200 -Subject: [PATCH] systemctl: enable sysv chkconfig handling for openSUSE. - ---- - src/systemctl.c | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/src/systemctl.c b/src/systemctl.c -index a82cce4..faca797 100644 ---- a/src/systemctl.c -+++ b/src/systemctl.c -@@ -4089,7 +4089,7 @@ static int install_info_apply(const char *verb, LookupPaths *paths, InstallInfo - } - - if (!f) { --#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA)) || defined(TARGET_MEEGO) && defined (HAVE_SYSV_COMPAT) -+#if (defined(TARGET_FEDORA) || defined(TARGET_MANDRIVA) || defined(TARGET_SUSE)) || defined(TARGET_MEEGO) && defined (HAVE_SYSV_COMPAT) - - if (endswith(i->name, ".service")) { - char *sysv; --- -1.7.3.4 - diff --git a/systemd-28.tar.bz2 b/systemd-28.tar.bz2 index 3057c822..4c2dabb2 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 1bd2751b..c89d0919 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +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 diff --git a/systemd.spec b/systemd.spec index 5339c7aa..0f6a3511 100644 --- a/systemd.spec +++ b/systemd.spec @@ -46,7 +46,6 @@ Conflicts: mkinitrd < 2.7.0 Source0: http://www.freedesktop.org/software/systemd/releases/%{name}-%{version}.tar.bz2 Source1: systemd-rpmlintrc Patch1: 0001-Add-bootsplash-handling-for-password-dialogs.patch -Patch2: 0001-systemctl-enable-sysv-chkconfig-handling-for-openSUS.patch # Upstream First - Policy: # Never add any patches to this package without the upstream commit id @@ -99,7 +98,6 @@ Plymouth integration for systemd %prep %setup -q %patch1 -p1 -%patch2 -p1 %build autoreconf -fiv