testing/aaa_base
SHA256
3
0
Fork 0
forked from pool/aaa_base
Code Pull Requests Activity

Accepting request 90962 from Base:System

Browse Source 
- Ensure /sbin/service is not clearing SYSTEMD_NO_WRAP (forwarded request 90940 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/90962
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=333
This commit is contained in:
Stephan Kulow 2011-11-14 10:49:27 +00:00 committed by Git OBS Bridge
commit 963c1863ea
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
aaa_base.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Nov 10 14:37:16 UTC 2011 - fcrozat@suse.com
- Ensure /sbin/service is not clearing SYSTEMD_NO_WRAP
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Nov 7 18:26:41 CET 2011 - dmueller@suse.de Mon Nov 7 18:26:41 CET 2011 - dmueller@suse.de

2
aaa_base.spec
View File

@ -35,6 +35,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
# run make package in checkout out git repo to recreate # run make package in checkout out git repo to recreate
Source: aaa_base.tar.bz2 Source: aaa_base.tar.bz2
Source99: aaa_base-rpmlintrc Source99: aaa_base-rpmlintrc
Patch0: systemd_no_wrap_service.patch
%description %description
This package installs several important configuration files. Central This package installs several important configuration files. Central
@ -54,6 +55,7 @@ and convenience hacks).
%prep %prep
%setup -n aaa_base %setup -n aaa_base
%patch0 -p1
%build %build
make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags} make CFLAGS="$RPM_OPT_FLAGS" CC="%{__cc}" %{?_smp_mflags}

19
systemd_no_wrap_service.patch Normal file
View File

@ -0,0 +1,19 @@
diff --git a/files/sbin/service b/files/sbin/service
index 5984b28..56ad239 100755
--- a/files/sbin/service
+++ b/files/sbin/service
@@ -21,12 +21,13 @@ RCDIR="/etc/init.d"
#
PATH=/sbin:/usr/sbin:/usr/local/sbin:/usr/local/bin:/bin:/usr/bin:/usr/X11R6/bin
test -n "$TERM" || TERM=raw
+test -n "$SYSTEMD_NO_WRAP" && export SYSTEMD_NO_WRAP
LANG=POSIX
export PATH TERM LANG
exec_rc ()
{
- env -i LANG=$LANG PATH=$PATH TERM=$TERM ${1+"$@"}
+ env -i LANG=$LANG PATH=$PATH TERM=$TERM SYSTEMD_NO_WRAP=$SYSTEMD_NO_WRAP ${1+"$@"}
}
usage ()