[systemd/f18] require 'sed', limit HOSTNAME= match
Kay Sievers
kay at fedoraproject.org
Thu Oct 25 16:50:09 UTC 2012
commit 5464d2588c07837a60b85bfce141514d77d23d06
Author: Kay Sievers <kay at vrfy.org>
Date: Thu Oct 25 18:24:34 2012 +0200
require 'sed', limit HOSTNAME= match
systemd.spec | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/systemd.spec b/systemd.spec
index 2483a5e..2ecb5bf 100644
--- a/systemd.spec
+++ b/systemd.spec
@@ -22,7 +22,7 @@ Url: http://www.freedesktop.org/wiki/Software/systemd
# THIS PACKAGE FOR A NON-RAWHIDE DEVELOPMENT DISTRIBUTION!
Version: 195
-Release: 4%{?gitcommit:.git%{gitcommit}}%{?dist}
+Release: 5%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager
@@ -59,6 +59,7 @@ BuildRequires: libtool
%endif
Requires(post): coreutils
Requires(post): gawk
+Requires(post): sed
Requires(pre): coreutils
Requires(pre): /usr/bin/getent
Requires(pre): /usr/sbin/groupadd
@@ -424,7 +425,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then
. /etc/sysconfig/network 2>&1 || :
[ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || :
fi
-/usr/bin/sed -i '/HOSTNAME/d' /etc/sysconfig/network 2>&1 || :
+/usr/bin/sed -i '/^HOSTNAME=/d' /etc/sysconfig/network 2>&1 || :
%posttrans
# Convert old /etc/sysconfig/desktop settings
@@ -678,6 +679,9 @@ fi
%{_libdir}/pkgconfig/gudev-1.0*
%changelog
+* Thu Oct 25 2012 Kay Sievers <kay at redhat.com> - 195-5
+- require 'sed', limit HOSTNAME= match
+
* Wed Oct 24 2012 Michal Schmidt <mschmidt at redhat.com> - 195-4
- add dmraid-activation.service to the default preset
- add yum protected.d fragment
More information about the scm-commits
mailing list