rpms/systemd
7
0
Fork 0
Code Issues Pull Requests Releases Activity

require 'sed', limit HOSTNAME= match

Browse Source
This commit is contained in:
Kay Sievers 2012-10-25 18:24:34 +02:00
parent 3c3608d36e
commit 5464d2588c
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
systemd.spec
View File

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