From 435d59deef78bed77e079e6f1dc4cca3f566599691e847f81fc310a11224bbf9 Mon Sep 17 00:00:00 2001 From: Marcus Meissner Date: Wed, 16 Dec 2009 00:10:38 +0000 Subject: [PATCH] Accepting request 25965 from home:michal-m:branches:Base:System Copy from home:michal-m:branches:Base:System/post-build-checks via accept of submit request 25965 revision 2. Request was accepted with message: ok OBS-URL: https://build.opensuse.org/request/show/25965 OBS-URL: https://build.opensuse.org/package/show/Base:System/post-build-checks?expand=0&rev=12 --- post-build-checks.changes | 6 ++++++ post-build-checks.spec | 7 +++++++ 2 files changed, 13 insertions(+) diff --git a/post-build-checks.changes b/post-build-checks.changes index 2fb4c6c..1e48d5e 100644 --- a/post-build-checks.changes +++ b/post-build-checks.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 7 14:58:27 CET 2009 - mmarek@suse.cz + +- do not mess with sysconfig files when installed in a live system + (no more missed appointments...). + ------------------------------------------------------------------- Thu Nov 5 15:48:37 CET 2009 - meissner@suse.de diff --git a/post-build-checks.spec b/post-build-checks.spec index 4a29b04..1b62a68 100644 --- a/post-build-checks.spec +++ b/post-build-checks.spec @@ -68,6 +68,10 @@ done rm -rf $RPM_BUILD_ROOT %post +# do nothing when not in a build chroot +if ! test -e /.buildenv; then + exit 0 +fi sed -i -e "s@^PERMISSION_SECURITY=.*@PERMISSION_SECURITY=\"secure\"@" /etc/sysconfig/security sed -i -e "s@^TIMEZONE=.*@TIMEZONE=\"UTC\"@" /etc/sysconfig/clock if test -f /bin/uname -a ! -L /bin/uname ; then @@ -76,6 +80,9 @@ if test -f /bin/uname -a ! -L /bin/uname ; then fi %preun +if ! test -e /.buildenv; then + exit 0 +fi if test "$1" = 0 -a -f /bin/uname.bin ; then mv /bin/uname.bin /bin/uname fi