diff --git a/netcfg.changes b/netcfg.changes index 11df41c..087a7f9 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,14 @@ +------------------------------------------------------------------- +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 + +- Keep the condition posix as it is shorter :) + ------------------------------------------------------------------- Mon Dec 1 16:56:09 UTC 2014 - tchvatal@suse.com diff --git a/netcfg.spec b/netcfg.spec index 3828b88..8e013b4 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -77,15 +77,12 @@ ln -s %{_sysconfdir}/hostname %{buildroot}%{_sysconfdir}/HOSTNAME # If hostname and HOSTNAME both exist HOSTNAME wins. # Nothing apart from content of the document is preserved # REMOVE after SLE11/openSUSE-13.1 out of MIGRATION support -if [ "0$1" -ge "2" ]; then +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 %{_sysconfdir}/hostname + touch %{_sysconfdir}/hostname + ln -s %{_sysconfdir}/hostname %{_sysconfdir}/HOSTNAME fi fi exit 0 @@ -93,13 +90,12 @@ exit 0 %post # If the defaultdomain changed just prune it, user is not interested in # 0 size file anyway -if [ -f etc/defaultdomain.rpmnew ]; then - rm -f etc/defaultdomain.rpmnew +if [ -f %{_sysconfdir}/defaultdomain.rpmnew ]; then + rm -f %{_sysconfdir}/defaultdomain.rpmnew fi - -# Put backuped HOSTNAME into the current hostname file if [ -f %{_sysconfdir}/hostname.rpmsave ]; then - mv %{_sysconfdir}/hostname.rpmsave %{_sysconfdir}/hostname + cat %{_sysconfdir}/hostname.rpmsave > %{_sysconfdir}/hostname + rm -rf %{_sysconfdir}/HOSTNAME.rpmsave %{_sysconfdir}/hostname.rpmsave fi exit 0