SHA256
3
0
forked from pool/aaa_base

Accepting request 176739 from Base:System

- move sysctl defaults to aaa_base (bnc#820443)

OBS-URL: https://build.opensuse.org/request/show/176739
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/aaa_base?expand=0&rev=380
This commit is contained in:
Stephan Kulow 2013-05-28 05:23:53 +00:00 committed by Git OBS Bridge
parent ccc738770e
commit 20b4fb41dc
3 changed files with 17 additions and 2 deletions

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:979c94570391e82b3ff31ea03fad7326b49044f191bb6472e6fd83ba8e86c012 oid sha256:cb6657815b53f920e447a75faf56761bb9e491946625b20de294a3d825bbd798
size 83164 size 84076

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon May 27 11:15:26 UTC 2013 - lnussel@suse.de
- move sysctl defaults to aaa_base (bnc#820443)
------------------------------------------------------------------- -------------------------------------------------------------------
Thu May 23 15:23:53 UTC 2013 - werner@suse.de Thu May 23 15:23:53 UTC 2013 - werner@suse.de

View File

@ -98,6 +98,12 @@ fi
# #
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
# #
mkdir -p %{buildroot}/etc/sysctl.d
case "$RPM_ARCH" in
s390*) ;;
*) rm -f %{buildroot}/usr/lib/sysctl.d/50-default-s390.conf ;;
esac
#
# make sure it does not creep in again # make sure it does not creep in again
test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1 test -d $RPM_BUILD_ROOT/root/.gnupg && exit 1
# #
@ -126,6 +132,7 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%doc COPYING %doc COPYING
%config(noreplace) %ghost /etc/sysctl.conf
%config /etc/bash.bashrc %config /etc/bash.bashrc
%config /etc/csh.cshrc %config /etc/csh.cshrc
%config /etc/csh.login %config /etc/csh.login
@ -197,6 +204,9 @@ rm -f /root/.gnupg/secring.gpg.aaa_save
/usr/share/man/man8/safe-rm.8* /usr/share/man/man8/safe-rm.8*
/usr/share/man/man8/safe-rmdir.8* /usr/share/man/man8/safe-rmdir.8*
/usr/share/man/man8/service.8* /usr/share/man/man8/service.8*
%dir /etc/sysctl.d
%dir /usr/lib/sysctl.d
/usr/lib/sysctl.d/*.conf
/var/adm/fillup-templates/sysconfig.backup /var/adm/fillup-templates/sysconfig.backup
/var/adm/fillup-templates/sysconfig.boot /var/adm/fillup-templates/sysconfig.boot
/var/adm/fillup-templates/sysconfig.clock /var/adm/fillup-templates/sysconfig.clock