Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2013-02-22 17:03:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "sysconfig", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2013-01-31 14:54:52.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2013-02-22 17:03:13.000000000 +0100 @@ -1,0 +2,10 @@ +Thu Feb 22 08:20:23 UTC 2013 - [email protected] + +- version 0.80.5 +- Fixed to use a guarded migration hook from openSUSE < 12.3, that + disabes the (always enabled before) NetworkManager.service on + NETWORKMANAGER=no and mask the network.service (provided by the + /etc/init.d/network script) on NETWORKMANAGER=yes until NM has + been installed and enabled as network.service (bnc#803058). + +------------------------------------------------------------------- Old: ---- sysconfig-0.80.4.tar.bz2 New: ---- sysconfig-0.80.5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.HmSGNV/_old 2013-02-22 17:03:14.000000000 +0100 +++ /var/tmp/diff_new_pack.HmSGNV/_new 2013-02-22 17:03:14.000000000 +0100 @@ -17,7 +17,7 @@ Name: sysconfig -Version: 0.80.4 +Version: 0.80.5 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ @@ -35,6 +35,7 @@ BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 +BuildRequires: pkgconfig(systemd) %define udevdir /usr/lib/udev %else %define udevdir /lib/udev @@ -123,6 +124,15 @@ if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then touch etc/sysconfig/network/__move_shm_sysconfig__ fi + # trigger update from < 0.80.x only (-> openSUSE 12.3), + # (guard for variable added to network/config later...) + if [ -x /usr/sbin/NetworkManager ] && grep -qs "^NETWORKMANAGER=" \ + var/adm/fillup-templates/sysconfig.config-network ; then + grep -s "^NETWORKMANAGER=" etc/sysconfig/network/config \ + > /dev/.sysconfig/network/migrate_nm_variable + elif [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then + rm -f /dev/.sysconfig/network/migrate_nm_variable + fi fi %post @@ -170,12 +180,31 @@ DHCLIENT_SCRIPT_EXE umask $_umask done -# erroneous move from network/dhcp to network/config while 11.1 beta -sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS -# remove NETWORKMANAGER variable; 12.3 is using network.service alias -sysconfig_remove_and_set network/config NETWORKMANAGER # be a little bit paranoid and set the correct mode even we set umask chmod 0600 etc/sysconfig/network/ifcfg-* +# bnc#803058: migrate from NETWORKMANAGER=yes/no variable to +# network.service alias link masking rcnetwork. +if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x /usr/bin/systemctl ] ; then + . /dev/.sysconfig/network/migrate_nm_variable + case $NETWORKMANAGER in + no) + # NetworkManager.service were always started before; stop + # and disable it, so /etc/init.d/network isn't masked... + /usr/bin/systemctl stop NetworkManager.service || : + /usr/bin/systemctl --force disable NetworkManager.service || : + rm -f /dev/.sysconfig/network/migrate_nm_variable + ;; + yes) + # Keep the /dev/.sysconfig/network/migrate_nm_variable file, + # as hint for migration in NetworkManager post-install ... + # Mask /etc/init.d/network service until NM update is done. + /usr/bin/systemctl --force mask network.service || : + ;; + esac +else + # cleanup obsolete NETWORKMANAGER variable + sysconfig_remove_and_set network/config NETWORKMANAGER +fi %postun %{insserv_cleanup} ++++++ sysconfig-0.80.4.tar.bz2 -> sysconfig-0.80.5.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.4/ChangeLog new/sysconfig-0.80.5/ChangeLog --- old/sysconfig-0.80.4/ChangeLog 2013-01-31 11:49:43.000000000 +0100 +++ new/sysconfig-0.80.5/ChangeLog 2013-02-22 09:28:07.000000000 +0100 @@ -1,4 +1,22 @@ -commit d3a88730e9a2675b1c6119a13adb951069fc2508 (HEAD, origin/master, master) +commit 4b058026fc4ab0709d5fad75200bdc3a638a9499 (HEAD, opensuse-12.3-wip-4, opensuse-12.3, master) +Author: Marius Tomaschewski <[email protected]> +Date: Fri Feb 22 09:20:23 2013 +0100 + + version 0.80.5, updated changes file + +commit 104ea8d216807366526aecbe1b28e2b8bc6ed196 +Author: Marius Tomaschewski <[email protected]> +Date: Fri Feb 22 09:17:33 2013 +0100 + + NETWORKMANAGER variable migration to openSUSE-12.3 + + Fixed to use a guarded migration hook from openSUSE < 12.3, that + disabes the (always enabled before) NetworkManager.service on + NETWORKMANAGER=no and mask the network.service (provided by the + /etc/init.d/network script) on NETWORKMANAGER=yes until NM has + been installed and enabled as network.service (bnc#803058). + +commit d3a88730e9a2675b1c6119a13adb951069fc2508 (origin/master, master-12) Author: Marius Tomaschewski <[email protected]> Date: Thu Jan 31 11:47:43 2013 +0100 @@ -114,7 +132,7 @@ The dhcp6_client state variable were set to dhclient while the config variable DHCLIENT6_BIN is using dhclient6 here. -commit 5e85eaf907dc16ff75a317591e7ff0172d4b8e44 (tag: version-0.80.0, origin/opensuse-12.3-wip, opensuse-12.3-wip) +commit 5e85eaf907dc16ff75a317591e7ff0172d4b8e44 (tag: version-0.80.0, origin/opensuse-12.3-wip) Author: Marius Tomaschewski <[email protected]> Date: Tue Jan 15 12:26:53 2013 +0100 @@ -186,7 +204,7 @@ Started new series, version 0.80.0 -commit 69b81a1a3fab45048f39b66eedf98512d38e60cc (opensuse-12.3) +commit 69b81a1a3fab45048f39b66eedf98512d38e60cc Author: Marius Tomaschewski <[email protected]> Date: Fri Jan 11 23:44:09 2013 +0100 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.4/VERSION new/sysconfig-0.80.5/VERSION --- old/sysconfig-0.80.4/VERSION 2013-01-31 11:48:29.000000000 +0100 +++ new/sysconfig-0.80.5/VERSION 2013-02-22 09:27:34.000000000 +0100 @@ -1 +1 @@ -0.80.4 +0.80.5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.4/configure new/sysconfig-0.80.5/configure --- old/sysconfig-0.80.4/configure 2013-01-31 11:48:38.000000000 +0100 +++ new/sysconfig-0.80.5/configure 2013-02-22 09:27:54.000000000 +0100 @@ -1,7 +1,7 @@ #! /bin/sh # From configure.in Revision: 1.13 . # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for sysconfig 0.80.4. +# Generated by GNU Autoconf 2.69 for sysconfig 0.80.5. # # Report bugs to <http://www.suse.de/feedback/>. # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.80.4' -PACKAGE_STRING='sysconfig 0.80.4' +PACKAGE_VERSION='0.80.5' +PACKAGE_STRING='sysconfig 0.80.5' PACKAGE_BUGREPORT='http://www.suse.de/feedback/' PACKAGE_URL='' @@ -1322,7 +1322,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures sysconfig 0.80.4 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.80.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,7 +1392,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.80.4:";; + short | recursive ) echo "Configuration of sysconfig 0.80.5:";; esac cat <<\_ACEOF @@ -1497,7 +1497,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.80.4 +sysconfig configure 0.80.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1866,7 +1866,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by sysconfig $as_me 0.80.4, which was +It was created by sysconfig $as_me 0.80.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2694,7 +2694,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.80.4' + VERSION='0.80.5' cat >>confdefs.h <<_ACEOF @@ -12174,7 +12174,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by sysconfig $as_me 0.80.4, which was +This file was extended by sysconfig $as_me 0.80.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12231,7 +12231,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -sysconfig config.status 0.80.4 +sysconfig config.status 0.80.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.4/sysconfig.spec new/sysconfig-0.80.5/sysconfig.spec --- old/sysconfig-0.80.4/sysconfig.spec 2013-01-31 11:48:42.000000000 +0100 +++ new/sysconfig-0.80.5/sysconfig.spec 2013-02-22 09:27:58.000000000 +0100 @@ -18,7 +18,7 @@ Name: sysconfig -Version: 0.80.4 +Version: 0.80.5 Release: 0 Summary: The sysconfig scheme and traditional network scripts License: GPL-2.0+ @@ -36,6 +36,7 @@ BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 +BuildRequires: pkgconfig(systemd) %define udevdir /usr/lib/udev %else %define udevdir /lib/udev @@ -124,6 +125,15 @@ if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then touch etc/sysconfig/network/__move_shm_sysconfig__ fi + # trigger update from < 0.80.x only (-> openSUSE 12.3), + # (guard for variable added to network/config later...) + if [ -x /usr/sbin/NetworkManager ] && grep -qs "^NETWORKMANAGER=" \ + var/adm/fillup-templates/sysconfig.config-network ; then + grep -s "^NETWORKMANAGER=" etc/sysconfig/network/config \ + > /dev/.sysconfig/network/migrate_nm_variable + elif [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then + rm -f /dev/.sysconfig/network/migrate_nm_variable + fi fi %post @@ -171,12 +181,31 @@ DHCLIENT_SCRIPT_EXE umask $_umask done -# erroneous move from network/dhcp to network/config while 11.1 beta -sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS -# remove NETWORKMANAGER variable; 12.3 is using network.service alias -sysconfig_remove_and_set network/config NETWORKMANAGER # be a little bit paranoid and set the correct mode even we set umask chmod 0600 etc/sysconfig/network/ifcfg-* +# bnc#803058: migrate from NETWORKMANAGER=yes/no variable to +# network.service alias link masking rcnetwork. +if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x /usr/bin/systemctl ] ; then + . /dev/.sysconfig/network/migrate_nm_variable + case $NETWORKMANAGER in + no) + # NetworkManager.service were always started before; stop + # and disable it, so /etc/init.d/network isn't masked... + /usr/bin/systemctl stop NetworkManager.service || : + /usr/bin/systemctl --force disable NetworkManager.service || : + rm -f /dev/.sysconfig/network/migrate_nm_variable + ;; + yes) + # Keep the /dev/.sysconfig/network/migrate_nm_variable file, + # as hint for migration in NetworkManager post-install ... + # Mask /etc/init.d/network service until NM update is done. + /usr/bin/systemctl --force mask network.service || : + ;; + esac +else + # cleanup obsolete NETWORKMANAGER variable + sysconfig_remove_and_set network/config NETWORKMANAGER +fi %postun %{insserv_cleanup} diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.4/sysconfig.spec.in new/sysconfig-0.80.5/sysconfig.spec.in --- old/sysconfig-0.80.4/sysconfig.spec.in 2013-01-31 11:48:29.000000000 +0100 +++ new/sysconfig-0.80.5/sysconfig.spec.in 2013-02-22 09:27:34.000000000 +0100 @@ -36,6 +36,7 @@ BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 +BuildRequires: pkgconfig(systemd) %define udevdir /usr/lib/udev %else %define udevdir /lib/udev @@ -124,6 +125,15 @@ if [ ! -f etc/sysconfig/network/scripts/move_shm_sysconfig.sh ] ; then touch etc/sysconfig/network/__move_shm_sysconfig__ fi + # trigger update from < 0.80.x only (-> openSUSE 12.3), + # (guard for variable added to network/config later...) + if [ -x /usr/sbin/NetworkManager ] && grep -qs "^NETWORKMANAGER=" \ + var/adm/fillup-templates/sysconfig.config-network ; then + grep -s "^NETWORKMANAGER=" etc/sysconfig/network/config \ + > /dev/.sysconfig/network/migrate_nm_variable + elif [ -f /dev/.sysconfig/network/migrate_nm_variable ] ; then + rm -f /dev/.sysconfig/network/migrate_nm_variable + fi fi %post @@ -171,12 +181,31 @@ DHCLIENT_SCRIPT_EXE umask $_umask done -# erroneous move from network/dhcp to network/config while 11.1 beta -sysconfig_remove_and_set network/config WRITE_HOSTNAME_TO_HOSTS -# remove NETWORKMANAGER variable; 12.3 is using network.service alias -sysconfig_remove_and_set network/config NETWORKMANAGER # be a little bit paranoid and set the correct mode even we set umask chmod 0600 etc/sysconfig/network/ifcfg-* +# bnc#803058: migrate from NETWORKMANAGER=yes/no variable to +# network.service alias link masking rcnetwork. +if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x /usr/bin/systemctl ] ; then + . /dev/.sysconfig/network/migrate_nm_variable + case $NETWORKMANAGER in + no) + # NetworkManager.service were always started before; stop + # and disable it, so /etc/init.d/network isn't masked... + /usr/bin/systemctl stop NetworkManager.service || : + /usr/bin/systemctl --force disable NetworkManager.service || : + rm -f /dev/.sysconfig/network/migrate_nm_variable + ;; + yes) + # Keep the /dev/.sysconfig/network/migrate_nm_variable file, + # as hint for migration in NetworkManager post-install ... + # Mask /etc/init.d/network service until NM update is done. + /usr/bin/systemctl --force mask network.service || : + ;; + esac +else + # cleanup obsolete NETWORKMANAGER variable + sysconfig_remove_and_set network/config NETWORKMANAGER +fi %postun %{insserv_cleanup} -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
