From 92e3252b7de0daa8b1a8b4946fb2946d7efa5f479472797c573ebaf3b36c1e40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= <tchvatal@suse.com>
Date: Wed, 17 Dec 2014 10:34:12 +0000
Subject: [PATCH] - Try different approach to fix failing migration from 13.1. 
  This one is from locilka

OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=37
---
 netcfg.changes |  6 ++++++
 netcfg.spec    | 17 +++++------------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/netcfg.changes b/netcfg.changes
index 5667422..087a7f9 100644
--- a/netcfg.changes
+++ b/netcfg.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Dec 17 10:32:15 UTC 2014 - tchvatal@suse.com
+
+- Try different approach to fix failing migration from 13.1.
+  This one is from locilka
+
 -------------------------------------------------------------------
 Wed Dec 17 10:19:29 UTC 2014 - tchvatal@suse.com
 
diff --git a/netcfg.spec b/netcfg.spec
index da767d9..c94c4ba 100644
--- a/netcfg.spec
+++ b/netcfg.spec
@@ -79,13 +79,11 @@ ln -s %{_sysconfdir}/hostname %{buildroot}%{_sysconfdir}/HOSTNAME
 # REMOVE after SLE11/openSUSE-13.1 out of MIGRATION support
 if [ $1 -gt 1 ]; then
   if [ -f %{_sysconfdir}/HOSTNAME -a ! -L %{_sysconfdir}/HOSTNAME ]; then
-    cp %{_sysconfdir}/HOSTNAME %{_sysconfdir}/hostname.rpmsave
-    rm %{_sysconfdir}/HOSTNAME
-  fi
-  # As some people are really on pills and did the link themselves other
-  # way around ensure the package will install for them.
-  if [ -f %{_sysconfdir}/hostname -a -f %{_sysconfdir}/hostname.rpmsave ]; then
-    rm %{_sysconfdir}/hostname
+    cat %{_sysconfdir}/HOSTNAME > %{_sysconfdir}/hostname.rpmsave
+    rm -rf %{_sysconfdir}/{HOSTNAME,hostname}
+    cat %{_sysconfdir}/hostname.rpmsave > %{_sysconfdir}/hostname
+    rm -rf %{_sysconfdir}/hostname.rpmsave
+    ln -s hostname %{_sysconfdir}/HOSTNAME
   fi
 fi
 exit 0
@@ -96,11 +94,6 @@ exit 0
 if [ -f etc/defaultdomain.rpmnew ]; then
   rm -f etc/defaultdomain.rpmnew
 fi
-
-# Put backuped HOSTNAME into the current hostname file
-if [ -f %{_sysconfdir}/hostname.rpmsave ]; then
-  mv %{_sysconfdir}/hostname.rpmsave %{_sysconfdir}/hostname
-fi
 exit 0
 
 %files