From eece9585b5f9258c7180247b1664e92b5ef83efe Mon Sep 17 00:00:00 2001 Message-Id: In-Reply-To: References: From: Scott Little Date: Mon, 2 Oct 2017 17:53:00 -0400 Subject: [PATCH 2/3] Protect sections of systemd post from running on patch Signed-off-by: Jim Somerville --- SPECS/systemd.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/SPECS/systemd.spec b/SPECS/systemd.spec index 16262fb..4c83150 100644 --- a/SPECS/systemd.spec +++ b/SPECS/systemd.spec @@ -1297,6 +1297,7 @@ fi rm -f /etc/sysconfig/i18n >/dev/null 2>&1 || : rm -f /etc/sysconfig/keyboard >/dev/null 2>&1 || : +if [ $1 -eq 1 ]; then # Migrate HOSTNAME= from /etc/sysconfig/network if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then unset HOSTNAME @@ -1304,6 +1305,7 @@ if [ -e /etc/sysconfig/network -a ! -e /etc/hostname ]; then [ -n "$HOSTNAME" ] && echo $HOSTNAME > /etc/hostname 2>&1 || : fi sed -i '/^HOSTNAME=/d' /etc/sysconfig/network >/dev/null 2>&1 || : +fi # Migrate the old systemd-setup-keyboard X11 configuration fragment if [ ! -e /etc/X11/xorg.conf.d/00-keyboard.conf ] ; then @@ -1312,6 +1314,7 @@ else rm -f /etc/X11/xorg.conf.d/00-system-setup-keyboard.conf >/dev/null 2>&1 || : fi +if [ 1 -eq 0 ] ; then # TIS: Skip this. We don't want myhostname in nsswitch.conf # sed-fu to add myhostname to the hosts line of /etc/nsswitch.conf # Only do that when installing, not when updating. if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then @@ -1321,6 +1324,7 @@ if [ $1 -eq 1 -a -f /etc/nsswitch.conf ] ; then s/[[:blank:]]*$/ myhostname/ ' /etc/nsswitch.conf >/dev/null 2>&1 || : fi +fi %posttrans # Convert old /etc/sysconfig/desktop settings -- 1.8.3.1