Kay Sievers 2011-06-14 13:26:41 +00:00 committed by Git OBS Bridge
parent 1d126eceda
commit fabf91e9da
4 changed files with 14 additions and 29 deletions

View File

@ -1,25 +0,0 @@
From ea4192a54fdbfebdec80f445d702625bc3412d7e Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
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

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:90691dd21bd9a296ec7cc2e6edaa5bc813c847b3219891afd9f38fb9696ddf70
size 816801
oid sha256:92e98fe32c7cff50933a3b865e28efba870fbacfa51cd58f2d13f117eb31a2c6
size 816790

View File

@ -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

View File

@ -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