Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2019-02-09 07:16:09 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new.28833 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig" Sat Feb 9 07:16:09 2019 rev:183 rq: version:0.85.1 Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2019-02-06 14:05:29.662670114 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new.28833/sysconfig.changes 2019-02-09 07:16:12.026431701 +0100 @@ -1,0 +2,5 @@ +Sat Feb 9 06:15:40 UTC 2019 - Stephan Kulow <[email protected]> + +- HOTPATCH (to be reverted): revert-var-adm-lib-netconfig-move.patch + +------------------------------------------------------------------- New: ---- revert-var-adm-lib-netconfig-move.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.K53y21/_old 2019-02-09 07:16:12.806431394 +0100 +++ /var/tmp/diff_new_pack.K53y21/_new 2019-02-09 07:16:12.810431393 +0100 @@ -35,6 +35,7 @@ Group: System/Base Url: https://github.com/openSUSE/sysconfig Source: %{name}-%{version}.tar.bz2 +Patch1: revert-var-adm-lib-netconfig-move.patch BuildRequires: libtool BuildRequires: pkgconfig Requires: /sbin/ifup @@ -58,6 +59,8 @@ Group: System/Base Requires: /bin/logger Requires(pre): sysconfig = %{version} +Requires(pre): coreutils +Requires(pre): diffutils Provides: /sbin/netconfig %description netconfig @@ -66,6 +69,7 @@ %prep %setup -q +%patch1 -p1 %build autoreconf -fvi ++++++ revert-var-adm-lib-netconfig-move.patch ++++++ commit 78f71a541570038838802b6718a6483875045b88 Author: Ignaz Forster <[email protected]> Date: Fri Feb 8 15:27:06 2019 +0100 Revert "Move /var/adm/netconfig to /var/lib/netconfig" This reverts commit 6f3c5aad8122ce83f35255adb499131838161bf3. On transactional systems this won't work as expected: With the old directory layout /var/lib/netconfig is not writeable, new MD5 hashes cannot be written there. On systems with the new /var subvolume the directory isn't mounted during the update, resulting in a noop. The MD5 sum will still be incorrect in the running system. Temporarily revert this change until a better solution is found. diff --git a/scripts/functions.netconfig b/scripts/functions.netconfig index d4eeadd..0fd0da4 100644 --- a/scripts/functions.netconfig +++ b/scripts/functions.netconfig @@ -24,7 +24,7 @@ r=$ROOT NETCONFIG_DNS_RANKING_DEFAULT="+/vpn/ -/auto/ +strongswan +openswan +racoon -avahi" test -z "$MD5DIR" && { - MD5DIR=$r/var/lib/netconfig/md5 + MD5DIR=$r/var/adm/netconfig/md5 #echo "Using MD5DIR=\"$MD5DIR\"..." } diff --git a/sysconfig.spec.in b/sysconfig.spec.in index b5b6db2..10acec6 100644 --- a/sysconfig.spec.in +++ b/sysconfig.spec.in @@ -58,7 +58,6 @@ Summary: Script to apply network provided settings Group: System/Base Requires: /bin/logger Requires(pre): sysconfig = %{version} -Requires(pre): coreutils Provides: /sbin/netconfig %description netconfig @@ -185,15 +184,4 @@ if test "$1" = "0" -a -x %{_initddir}/network ; then %{_initddir}/network stop-all-dhcp-clients 2>/dev/null || : fi -%post netconfig -if [ $1 -eq 2 ]; then - # in upgrade case, move /var/adm/netconfig to /var/lib/netconfig - if [ -d /var/adm/netconfig -a ! -e /var/lib/netconfig ]; then - mkdir -p /var/lib/netconfig - cp -a /var/adm/netconfig/* /var/lib/netconfig - rm -rf /var/adm/netconfig - ln -sf /var/lib/netconfig /var/adm/netconfig - fi -fi - %changelog
