From 25ff140c554f746d12b055507c6a209e4e84bb0b50adfc6798e9bdd1f049ce34 Mon Sep 17 00:00:00 2001 From: Kay Sievers Date: Tue, 14 Jun 2011 13:26:41 +0000 Subject: [PATCH] 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