From 5a806794175926a42a4d7826c5604dbcddf54896eeb68cd1d1ab5ff56168b387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Mon, 1 Dec 2014 16:23:08 +0000 Subject: [PATCH] - Drop the scriptlet for the netgroup handling. It was caused by the aaa_base -> netcfg move, which I guess after 12 years is moot OBS-URL: https://build.opensuse.org/package/show/Base:System/netcfg?expand=0&rev=31 --- netcfg.changes | 6 ++++++ netcfg.spec | 11 ----------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/netcfg.changes b/netcfg.changes index 9f868be..e8583b9 100644 --- a/netcfg.changes +++ b/netcfg.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 1 16:22:22 UTC 2014 - tchvatal@suse.com + +- Drop the scriptlet for the netgroup handling. It was caused by + the aaa_base -> netcfg move, which I guess after 12 years is moot + ------------------------------------------------------------------- Thu Oct 2 18:49:01 UTC 2014 - pgajdos@suse.com diff --git a/netcfg.spec b/netcfg.spec index 256465e..248ddf6 100644 --- a/netcfg.spec +++ b/netcfg.spec @@ -74,13 +74,6 @@ rm -f %{buildroot}%{_sysconfdir}/services.orig ln -s %{_sysconfdir}/hostname %{buildroot}%{_sysconfdir}/HOSTNAME %pre -if [ "0$1" -ge "2" ]; then -# If we have a /etc/netgroup.rpmsave and no /etc/netgroup, copy -# /etc/netgroup.rpmsave and use it later instead of the new one. - if [ -f %{_sysconfdir}/netgroup.rpmsave -a ! -e %{_sysconfdir}/netgroup ]; then - cp %{_sysconfdir}/netgroup.rpmsave %{_sysconfdir}/...netgroup.new.rpmnew - fi -fi #/etc/HOSTNAME renamed to /etc/hostname [bnc#858908] #On Tue, Jun 10, 2014 at 03:23:00PM +0200, Frederic Crozat wrote: #> So, it means netcfg should have a %pre which check if /etc/HOSTNAME is a @@ -98,10 +91,6 @@ fi %post test -f etc/defaultdomain.rpmnew -a ! -s etc/defaultdomain.rpmnew && rm -f etc/defaultdomain.rpmnew -if [ -f etc/...netgroup.new.rpmnew ]; then - test ! -f etc/netgroup.rpmnew && cp etc/netgroup etc/netgroup.rpmnew - mv etc/...netgroup.new.rpmnew etc/netgroup -fi if [ -f /etc/HOSTNAME.rpmsave -a ! -L /etc/HOSTNAME.rpmsave ]; then cp -a /etc/HOSTNAME.rpmsave /etc/hostname fi