commit sysconfig for openSUSE:Factory
Hello community, here is the log from the commit of package sysconfig for openSUSE:Factory checked in at 2013-09-11 13:18:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/sysconfig (Old) and /work/SRC/openSUSE:Factory/.sysconfig.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "sysconfig" Changes: -------- --- /work/SRC/openSUSE:Factory/sysconfig/sysconfig.changes 2013-08-19 13:31:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.sysconfig.new/sysconfig.changes 2013-09-11 13:18:22.000000000 +0200 @@ -1,0 +2,34 @@ +Mon Sep 9 13:43:20 UTC 2013 - mt@suse.de + +- version 0.81.3 +- Fixed to reload syslog on hostname changes using systemctl as + there is no /etc/init.d/syslog script since syslog-service-2.0 + (bnc#830467). +- Added a systemctl guard to rpm post script + +------------------------------------------------------------------- +Tue Sep 3 10:20:22 UTC 2013 - mt@suse.de + +- version 0.81.2 +- Added otherproviders(/sbin/ifup) conflict to sysconfig-network. +- Do not stop the network interfaces, but kill the network and all + network@<ifname> services to kill all dhcp clients on uninstall. + +------------------------------------------------------------------- +Wed Aug 28 16:45:53 UTC 2013 - mt@suse.de + +- version 0.81.1 +- Initial network and network@ service files to avoid, that systemd + udevd kills dhcp clients, which where forked from the udev hotplug + rule and for better control (bnc#821879). + +------------------------------------------------------------------- +Fri Aug 16 11:51:57 UTC 2013 - mt@suse.de + +- version 0.81.0 +- Initial sysconfig split into udevmountd, sysconfig, -netconfig + and -network packages, to allow another implementation of the + /etc/init.d/network and /sbin/ifup scripts. +- Dropped obsolete README files. + +------------------------------------------------------------------- Old: ---- sysconfig-0.80.7.tar.bz2 New: ---- sysconfig-0.81.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ sysconfig.spec ++++++ --- /var/tmp/diff_new_pack.dwS7Rt/_old 2013-09-11 13:18:23.000000000 +0200 +++ /var/tmp/diff_new_pack.dwS7Rt/_new 2013-09-11 13:18:23.000000000 +0200 @@ -17,21 +17,13 @@ Name: sysconfig -Version: 0.80.7 +Version: 0.81.3 Release: 0 -Summary: The sysconfig scheme and traditional network scripts +Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ Group: System/Base -Url: http://gitorious.org/opensuse/sysconfig +Url: https://github.com/openSUSE/sysconfig PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep -# we may create these automatically from rpm later -Provides: sysvinit(network) -Requires: bridge-utils -Requires: dbus-1 -Requires: iproute2 -Requires: procps -Requires: tunctl -Requires: vlan BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 @@ -41,9 +33,14 @@ %define udevdir /lib/udev %endif Source: %name-%version.tar.bz2 +Requires: /sbin/ifup +Requires: /sbin/netconfig +Requires: udevmountd = %{version} +Requires: sysvinit(network) +Recommends: sysconfig-network = %{version} %description -This package provides the SuSE system configuration scheme and the +This package provides the SuSE system configuration scheme for the traditional "ifup" alias "netcontrol" network scripts. Authors: @@ -56,7 +53,69 @@ Michal Svec <msvec@suse.cz> Christian Zoz <zoz@suse.de> Werner Fink <werner@suse.de> + Hannes Reinecke <hare@suse.de> + Marius Tomaschewski <mt@suse.de> + +%package -n udevmountd +Summary: Automount daemon for udev +Group: System/Base +Requires(pre): sysconfig = %{version} + +%description -n udevmountd +This package provides the udev mount daemon and its udev rule. + +Authors: +-------- + Hannes Reinecke <hare@suse.de> + + +%package netconfig +Summary: Script to apply network provided settings +Group: System/Base +Requires(pre): sysconfig = %{version} +Provides: /sbin/netconfig + +%description netconfig +This package provides the netconfig scripts to apply network +provided settings like DNS or NIS into system files. + +Authors: +-------- + Michael Calmer <mc@suse.de> Marius Tomaschewski <mt@suse.de> + Milisav Radmanic <radmanic@suse.de> + + +%package network +Summary: Traditional network scripts +Group: System/Base +Requires(pre): sysconfig = %{version} +Requires: /sbin/netconfig +Requires: bridge-utils +Requires: iproute2 +Requires: procps +Requires: tunctl +Requires: vlan +Provides: /sbin/ifup +Conflicts: otherproviders(/sbin/ifup) + +%description network +This package provides the traditional "ifup" alias "netcontrol" +network scripts. + +Authors: +-------- + Olaf Kirch <okir@suse.de> + Bjoern Jacke <bjoern@j3e.de> + Mads Martin Joergensen <mmj@suse.de> + Peter Poeml <poeml@suse.de> + Arvin Schnell <arvin@suse.de> + Michal Svec <msvec@suse.cz> + Christian Zoz <zoz@suse.de> + Werner Fink <werner@suse.de> + Hannes Reinecke <hare@suse.de> + Marius Tomaschewski <mt@suse.de> + %prep %setup -n sysconfig-%{version} @@ -69,6 +128,7 @@ --libdir=/%_lib \ --sysconfdir=%_sysconfdir \ --mandir=%_mandir \ + --with-unitdir=%_unitdir \ --with-udevdir=%udevdir \ --with-fillup-templatesdir=/var/adm/fillup-templates %{__make} %{?_smp_mflags} @@ -88,36 +148,69 @@ %files %defattr(-,root,root) -/etc/init.d/* +%dir /etc/modprobe.d +%config /etc/modprobe.d/50-blacklist.conf +%config /etc/sysconfig/network/ifcfg.template %ghost /etc/sysconfig/network/config %ghost /etc/sysconfig/network/dhcp %config(noreplace) %attr(600,root,root) /etc/sysconfig/network/ifcfg-lo %config(noreplace) /etc/sysconfig/network/ifroute-lo +%dir /usr/share/doc/packages/sysconfig +%doc /usr/share/doc/packages/sysconfig/Contents +%doc /usr/share/doc/packages/sysconfig/COPYING + +%files network +%defattr(-,root,root) %config(noreplace) /etc/ppp/ip-up %config(noreplace) /etc/ppp/ip-down %config(noreplace) /etc/ppp/ipv6-up %config(noreplace) /etc/ppp/ipv6-down -%dir %udevdir -%udevdir/udevmountd -%dir %udevdir/rules.d +/etc/ppp/poll.tcpip %udevdir/rules.d/77-network.rules -%udevdir/rules.d/81-mount.rules -%dir /etc/modprobe.d -%config /etc/sysconfig/network/ifcfg.template -%config /etc/modprobe.d/50-blacklist.conf -/etc/sysconfig/network/scripts/* +/etc/sysconfig/network/scripts/functions +/etc/sysconfig/network/scripts/functions.common +/etc/sysconfig/network/scripts/functions.rpm-utils +/etc/sysconfig/network/scripts/extradebug +/etc/sysconfig/network/scripts/if* +/etc/sysconfig/network/scripts/convert* +/etc/sysconfig/network/scripts/move_shm_sysconfig.sh +/etc/sysconfig/network/scripts/create-ifservices-directory +/etc/sysconfig/network/scripts/dhcpcd-hook +/etc/sysconfig/network/scripts/link_wait /etc/sysconfig/network/if-up.d/ndp-proxy /etc/sysconfig/network/if-down.d/ndp-proxy -/etc/netconfig.d -/etc/ppp/poll.tcpip -/sbin/* -%doc /usr/share/doc/packages/sysconfig -%_mandir/*/* /usr/share/omc/svcinfo.d/network.xml /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-network +%dir /usr/share/doc/packages/sysconfig +%doc /usr/share/doc/packages/sysconfig/Network +%doc /usr/share/doc/packages/sysconfig/README* +%_mandir/*/if* +%_mandir/*/routes* +%_unitdir/network@.service +%_unitdir/network.service +/etc/init.d/network +/sbin/if* +/sbin/autoip +/sbin/rcnetwork + +%files netconfig +%defattr(-,root,root) +%dir /etc/netconfig.d +/etc/netconfig.d/* +/etc/sysconfig/network/scripts/functions.netconfig +/sbin/netconfig +/usr/share/man/man8/netconfig.8.gz +%doc /usr/share/doc/packages/sysconfig/netconfig.png + +%files -n udevmountd +%defattr(-,root,root) +%dir %udevdir +%udevdir/udevmountd +%dir %udevdir/rules.d +%udevdir/rules.d/81-mount.rules -%pre +%pre network # package update ? if [ ${1:-0} -gt 1 ]; then # update to >= 0.72.1 (-> openSUSE 11.2) @@ -136,7 +229,7 @@ fi fi -%post +%post network # * update to >= 0.72.1: before anything else, move state # files from dev/shm/sysconfig to dev/.sysconfig/network if [ -f etc/sysconfig/network/__move_shm_sysconfig__ ] ; then @@ -185,6 +278,7 @@ chmod 0600 etc/sysconfig/network/ifcfg-* # bnc#803058: migrate from NETWORKMANAGER=yes/no variable to # network.service alias link masking rcnetwork. +enable=yes if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x /usr/bin/systemctl ] ; then . /dev/.sysconfig/network/migrate_nm_variable case $NETWORKMANAGER in @@ -200,18 +294,30 @@ # 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 || : + enable=no ;; esac else # cleanup obsolete NETWORKMANAGER variable sysconfig_remove_and_set network/config NETWORKMANAGER fi +if test "$enable" = "yes" -a -x /usr/bin/systemctl ; then + _id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || : + case "${_id#Id=}" in + ""|network.service) + /usr/bin/systemctl --system daemon-reload || : + /usr/bin/systemctl --force enable network.service || : + ;; + esac +fi -%postun +%postun network %{insserv_cleanup} /sbin/ldconfig -%preun -%{stop_on_removal network} +%preun network +if test "$1" = "0" -a -x /etc/init.d/network ; then + /etc/init.d/network stop-all-dhcp-clients || : +fi %changelog ++++++ sysconfig-0.80.7.tar.bz2 -> sysconfig-0.81.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/ChangeLog new/sysconfig-0.81.3/ChangeLog --- old/sysconfig-0.80.7/ChangeLog 2013-08-14 11:21:35.000000000 +0200 +++ new/sysconfig-0.81.3/ChangeLog 2013-09-09 15:55:24.000000000 +0200 @@ -1,10 +1,135 @@ -commit b43e43c2d65593b71cb0321420b628ed52731940 (HEAD, master) +commit 7b1b7f8c05ef92b6005c15c5ad2e4bc82cfce00b (HEAD, origin/master, master) +Author: Marius Tomaschewski <mt@suse.com> +Date: Mon Sep 9 15:54:28 2013 +0200 + + version 0.81.3, updated changes file + +commit a3615e995f4c6949c7ff24c2f54e2596d9974466 (stop-all-dhcp-clients) +Author: Marius Tomaschewski <mt@suse.com> +Date: Mon Sep 9 15:24:17 2013 +0200 + + Fixed dhcpcd-hook to reload syslog using systemctl + + Fixed to reload syslog on hostname changes using systemctl as + there is no /etc/init.d/syslog script since syslog-service-2.0 + (bnc#830467). + +commit 4d8f5cc72d62a5ca2b80efd770160a95a4325353 +Author: Marius Tomaschewski <mt@suse.com> +Date: Mon Sep 9 15:22:05 2013 +0200 + + Added a systemctl guard to rpm post script + +commit 44594fe029a996f90d27a78b6ecc879d54fe80ef (tag: version-0.81.2) +Author: Marius Tomaschewski <mt@suse.com> +Date: Tue Sep 3 12:20:34 2013 +0200 + + version 0.81.2, updated changes file + +commit 918bd41df8fe2a7c47543af75d77ed43674e1ecb +Author: Marius Tomaschewski <mt@suse.com> +Date: Tue Sep 3 12:17:55 2013 +0200 + + Added otherproviders(/sbin/ifup) rpm conflict + +commit edf6eff5e9f76cacf33e276231b0233dc9e30ed3 +Author: Marius Tomaschewski <mt@suse.com> +Date: Tue Sep 3 12:14:37 2013 +0200 + + Do not stop, but kill network daemons on uninstall + + Do not stop the network interfaces, but kill the network and all + network@<ifname> services to kill all dhcp clients on uninstall. + +commit a082860e14e218d5e19a34f05c4b00c1b265d031 (tag: version-0.81.1, master-02) +Author: Marius Tomaschewski <mt@suse.com> +Date: Wed Aug 28 18:51:29 2013 +0200 + + version 0.81.1, updated changes file + +commit 2466b14065729f2c8a4c13aae97f9f4ac77ccca5 +Author: Marius Tomaschewski <mt@suse.com> +Date: Wed Aug 28 18:44:00 2013 +0200 + + Redirect ifup/ifdown to network@ifname.service + +commit 411693f31bc09e4003bf9224ca73d8d78842ff04 +Author: Marius Tomaschewski <mt@suse.com> +Date: Wed Aug 28 18:42:37 2013 +0200 + + Enable the new network.service file at install + +commit e3fdeb58c9d95e9d3138b978045d5d8a1d096ec8 +Author: Marius Tomaschewski <mt@suse.com> +Date: Wed Aug 28 18:27:10 2013 +0200 + + Initial network and network@.service file (bnc#821879) + + Added network@.service to avoid that systemd-udev kills dhcp clients + which where forked out of the udev hotplug rule 77 and network.service + file to be able to set GuessMainPID=yes and RemainAfterExit=yes. + +commit 5fad6f072aea36140c3236b270463c302f875b53 +Author: Marius Tomaschewski <mt@suse.com> +Date: Wed Aug 28 17:54:43 2013 +0200 + + added new --with-unitdir configure option + +commit 02fe34def0949228053b2d379dbca7b1886b2017 (gitorious/master, gitorious-master) +Author: Marius Tomaschewski <mt@suse.com> +Date: Mon Aug 26 18:22:40 2013 +0200 + + Moved to https://github.com/openSUSE/sysconfig + + Adppted url in configure and spec file templates + +commit b496bb79191097d9b5a8aa3f81c323979196e06f +Author: Marius Tomaschewski <mt@suse.com> +Date: Fri Aug 23 14:25:29 2013 +0200 + + Fixed DHCLIENT_LEASE_TIME variable description + +commit 8726519c0a28bb61860f1df6c42dc5e0abb7b6ac (tag: version-0.81.0) +Author: Marius Tomaschewski <mt@suse.com> +Date: Fri Aug 16 13:52:20 2013 +0200 + + spec file fixes, updated syslog.changes date + +commit 4cbbf7485d66f81e59cebc0d13a4ee47a886d595 +Author: Marius Tomaschewski <mt@suse.com> +Date: Fri Aug 16 13:33:55 2013 +0200 + + version 0.81.0, updated changes file + +commit 6eeb97a8a237da859b83450b94895bad7d7a5956 (old-master-split-2) +Author: Marius Tomaschewski <mt@suse.com> +Date: Fri Aug 16 13:25:35 2013 +0200 + + Dropped obsolete README files + +commit 51c89bb9961762022a8d0cd1aebedba00d848418 +Author: Marius Tomaschewski <mt@suse.com> +Date: Fri Aug 16 12:07:30 2013 +0200 + + Initial sysconfig split into multiple packages + + Initial sysconfig split into udevmountd, sysconfig, -netconfig + and -network packages, to allow different implementation of the + /etc/init.d/network and /sbin/ifup scripts (sysconfig-network). + +commit 459621113747dd1a1fa05038ea543e918233c6d3 +Author: Marius Tomaschewski <mt@suse.com> +Date: Fri Aug 16 12:06:07 2013 +0200 + + Started new 0.81 series in master branch + +commit b43e43c2d65593b71cb0321420b628ed52731940 (tag: version-0.80.7, origin/opensuse-13.1, gitorious/opensuse-13.1, opensuse-13.1) Author: Marius Tomaschewski <mt@suse.com> Date: Wed Aug 14 11:21:06 2013 +0200 version 0.80.7, updated changes file -commit 6f3592793ef24070c5414dccd82ce00bd9f9bc73 (origin/master) +commit 6f3592793ef24070c5414dccd82ce00bd9f9bc73 Author: Marius Tomaschewski <mt@suse.com> Date: Thu Aug 8 09:56:53 2013 +0200 @@ -80,7 +205,7 @@ the bonding interface is using the MAC of the currently active slave (bnc#815025). -commit 865c699a6dc85ff9d73ccf9159d7ae6f02530011 (origin/opensuse-12.3, opensuse-12.3) +commit 865c699a6dc85ff9d73ccf9159d7ae6f02530011 (origin/opensuse-12.3, gitorious/opensuse-12.3, opensuse-12.3) Author: Marius Tomaschewski <mt@suse.com> Date: Thu Apr 4 12:49:28 2013 +0200 @@ -412,7 +537,7 @@ default of 5 secs wait limit. A WAIT_BACKGROUND_JOBS=0 disables a parallel/background hook script execution. -commit 2f25f2e046af65db2056b009da181eec31e9d1cd (public/master, export/master) +commit 2f25f2e046af65db2056b009da181eec31e9d1cd Merge: a964df8 95976ed Author: Marius Tomaschewski <mt@suse.com> Date: Fri Oct 26 14:08:36 2012 +0200 @@ -510,7 +635,7 @@ Hint to use STARTMODE=nfsroot when using iSCSI -commit 24a91302e36c7773ecf4bc29801287452c960640 (tag: version-0.76.4, tag: opensuse-12.2-release, public/opensuse-12.2, export/opensuse-12.2) +commit 24a91302e36c7773ecf4bc29801287452c960640 (tag: version-0.76.4, tag: opensuse-12.2-release) Author: Marius Tomaschewski <mt@suse.com> Date: Thu Aug 9 16:42:02 2012 +0000 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/Makefile.in new/sysconfig-0.81.3/Makefile.in --- old/sysconfig-0.80.7/Makefile.in 2013-08-14 11:21:26.000000000 +0200 +++ new/sysconfig-0.81.3/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -254,6 +254,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ EXTRA_DIST = VERSION \ sysconfig.spec \ sysconfig.spec.in diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/VERSION new/sysconfig-0.81.3/VERSION --- old/sysconfig-0.80.7/VERSION 2013-08-14 11:17:34.000000000 +0200 +++ new/sysconfig-0.81.3/VERSION 2013-09-09 15:43:00.000000000 +0200 @@ -1 +1 @@ -0.80.7 +0.81.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/config/Makefile.am new/sysconfig-0.81.3/config/Makefile.am --- old/sysconfig-0.80.7/config/Makefile.am 2013-08-14 11:15:24.000000000 +0200 +++ new/sysconfig-0.81.3/config/Makefile.am 2013-08-28 18:52:05.000000000 +0200 @@ -16,10 +16,13 @@ omc_svcinfo_DATA = network.xml +unit_DATA = network.service network@.service + EXTRA_DIST = $(sysconfig_network_DATA) \ $(udevrules_DATA) \ $(fillup_templates_DATA) \ - $(omc_svcinfo_DATA) + $(omc_svcinfo_DATA) \ + $(unit_DATA) install-data-hook: mkdir -p $(DESTDIR)@sysconfig_networkdir@/providers diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/config/Makefile.in new/sysconfig-0.81.3/config/Makefile.in --- old/sysconfig-0.80.7/config/Makefile.in 2013-08-14 11:21:26.000000000 +0200 +++ new/sysconfig-0.81.3/config/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -103,9 +103,9 @@ am__installdirs = "$(DESTDIR)$(fillup_templatesdir)" \ "$(DESTDIR)$(omc_svcinfodir)" \ "$(DESTDIR)$(sysconfig_networkdir)" \ - "$(DESTDIR)$(udevrulesdir)" + "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(unitdir)" DATA = $(fillup_templates_DATA) $(omc_svcinfo_DATA) \ - $(sysconfig_network_DATA) $(udevrules_DATA) + $(sysconfig_network_DATA) $(udevrules_DATA) $(unit_DATA) RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \ distclean-recursive maintainer-clean-recursive AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \ @@ -266,6 +266,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = hardware @@ -278,10 +279,12 @@ sysconfig.config-network omc_svcinfo_DATA = network.xml +unit_DATA = network.service network@.service EXTRA_DIST = $(sysconfig_network_DATA) \ $(udevrules_DATA) \ $(fillup_templates_DATA) \ - $(omc_svcinfo_DATA) + $(omc_svcinfo_DATA) \ + $(unit_DATA) all: all-recursive @@ -406,6 +409,27 @@ @list='$(udevrules_DATA)'; test -n "$(udevrulesdir)" || list=; \ files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ dir='$(DESTDIR)$(udevrulesdir)'; $(am__uninstall_files_from_dir) +install-unitDATA: $(unit_DATA) + @$(NORMAL_INSTALL) + @list='$(unit_DATA)'; test -n "$(unitdir)" || list=; \ + if test -n "$$list"; then \ + echo " $(MKDIR_P) '$(DESTDIR)$(unitdir)'"; \ + $(MKDIR_P) "$(DESTDIR)$(unitdir)" || exit 1; \ + fi; \ + for p in $$list; do \ + if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \ + echo "$$d$$p"; \ + done | $(am__base_list) | \ + while read files; do \ + echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(unitdir)'"; \ + $(INSTALL_DATA) $$files "$(DESTDIR)$(unitdir)" || exit $$?; \ + done + +uninstall-unitDATA: + @$(NORMAL_UNINSTALL) + @list='$(unit_DATA)'; test -n "$(unitdir)" || list=; \ + files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \ + dir='$(DESTDIR)$(unitdir)'; $(am__uninstall_files_from_dir) # This directory's subdirectories are mostly independent; you can cd # into them and run 'make' without going through this Makefile. @@ -620,7 +644,7 @@ all-am: Makefile $(DATA) installdirs: installdirs-recursive installdirs-am: - for dir in "$(DESTDIR)$(fillup_templatesdir)" "$(DESTDIR)$(omc_svcinfodir)" "$(DESTDIR)$(sysconfig_networkdir)" "$(DESTDIR)$(udevrulesdir)"; do \ + for dir in "$(DESTDIR)$(fillup_templatesdir)" "$(DESTDIR)$(omc_svcinfodir)" "$(DESTDIR)$(sysconfig_networkdir)" "$(DESTDIR)$(udevrulesdir)" "$(DESTDIR)$(unitdir)"; do \ test -z "$$dir" || $(MKDIR_P) "$$dir"; \ done install: install-recursive @@ -676,7 +700,8 @@ info-am: install-data-am: install-fillup_templatesDATA install-omc_svcinfoDATA \ - install-sysconfig_networkDATA install-udevrulesDATA + install-sysconfig_networkDATA install-udevrulesDATA \ + install-unitDATA @$(NORMAL_INSTALL) $(MAKE) $(AM_MAKEFLAGS) install-data-hook install-dvi: install-dvi-recursive @@ -722,7 +747,8 @@ ps-am: uninstall-am: uninstall-fillup_templatesDATA uninstall-omc_svcinfoDATA \ - uninstall-sysconfig_networkDATA uninstall-udevrulesDATA + uninstall-sysconfig_networkDATA uninstall-udevrulesDATA \ + uninstall-unitDATA .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) \ cscopelist-recursive ctags-recursive install-am \ @@ -739,12 +765,13 @@ install-info install-info-am install-man \ install-omc_svcinfoDATA install-pdf install-pdf-am install-ps \ install-ps-am install-strip install-sysconfig_networkDATA \ - install-udevrulesDATA installcheck installcheck-am installdirs \ - installdirs-am maintainer-clean maintainer-clean-generic \ - mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \ - ps ps-am tags tags-recursive uninstall uninstall-am \ - uninstall-fillup_templatesDATA uninstall-omc_svcinfoDATA \ - uninstall-sysconfig_networkDATA uninstall-udevrulesDATA + install-udevrulesDATA install-unitDATA installcheck \ + installcheck-am installdirs installdirs-am maintainer-clean \ + maintainer-clean-generic mostlyclean mostlyclean-generic \ + mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \ + uninstall uninstall-am uninstall-fillup_templatesDATA \ + uninstall-omc_svcinfoDATA uninstall-sysconfig_networkDATA \ + uninstall-udevrulesDATA uninstall-unitDATA install-data-hook: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/config/hardware/Makefile.in new/sysconfig-0.81.3/config/hardware/Makefile.in --- old/sysconfig-0.80.7/config/hardware/Makefile.in 2013-08-14 11:21:26.000000000 +0200 +++ new/sysconfig-0.81.3/config/hardware/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -223,6 +223,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in udevrules_DATA = 81-mount.rules diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/config/network.service new/sysconfig-0.81.3/config/network.service --- old/sysconfig-0.80.7/config/network.service 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.81.3/config/network.service 2013-08-28 18:52:05.000000000 +0200 @@ -0,0 +1,15 @@ +[Unit] +Description=LSB: Configure network interfaces and set up routing +Wants=network.target +Before=network.target shutdown.target multi-user.target +After=local-fs.target SuSEfirewall2_init.service earlysyslog.service isdn.service openibd.service + +[Service] +Type=forking +ExecStart=/etc/init.d/network start +ExecStop=/etc/init.d/network stop +ExecReload=/etc/init.d/network reload +RemainAfterExit=yes + +[Install] +WantedBy=multi-user.target graphical.target diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/config/network@.service new/sysconfig-0.81.3/config/network@.service --- old/sysconfig-0.80.7/config/network@.service 1970-01-01 01:00:00.000000000 +0100 +++ new/sysconfig-0.81.3/config/network@.service 2013-08-28 18:52:05.000000000 +0200 @@ -0,0 +1,12 @@ +[Unit] +Description=ifup managed network interface %i +Requisite=network.service +PartOf=network.service +BindsTo=sys-subsystem-net-devices-%i.device + +[Service] +Type=forking +RemainAfterExit=yes +ExecStart=/sbin/ifup %i +ExecStop=/sbin/ifdown %i +SuccessExitStatus=12 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/config/sysconfig.dhcp-network new/sysconfig-0.81.3/config/sysconfig.dhcp-network --- old/sysconfig-0.80.7/config/sysconfig.dhcp-network 2013-05-16 10:35:17.000000000 +0200 +++ new/sysconfig-0.81.3/config/sysconfig.dhcp-network 2013-08-28 17:45:14.000000000 +0200 @@ -167,8 +167,8 @@ # # Lease time to request ( -l option) # -# Specifies (in seconds) the lease that is suggested to the server. -# The default is 1 hour, use -1 to request infinite lease time. +# Specifies the lease time (in seconds), that is suggested to the +# server. Default is to use the lease time offered by the server. # DHCLIENT_LEASE_TIME="" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/configure new/sysconfig-0.81.3/configure --- old/sysconfig-0.80.7/configure 2013-08-14 11:21:26.000000000 +0200 +++ new/sysconfig-0.81.3/configure 2013-09-09 15:55:16.000000000 +0200 @@ -1,9 +1,9 @@ #! /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.7. +# Generated by GNU Autoconf 2.69 for sysconfig 0.81.3. # -# Report bugs to <http://www.suse.de/feedback/>. +# Report bugs to <http://bugs.opensuse.org>. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -276,10 +276,10 @@ $as_echo "$0: be upgraded to zsh 4.3.4 or later." else $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: http://www.suse.de/feedback/ about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: http://bugs.opensuse.org about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." fi exit 1 fi @@ -591,10 +591,10 @@ # Identity of this package. PACKAGE_NAME='sysconfig' PACKAGE_TARNAME='sysconfig' -PACKAGE_VERSION='0.80.7' -PACKAGE_STRING='sysconfig 0.80.7' -PACKAGE_BUGREPORT='http://www.suse.de/feedback/' -PACKAGE_URL='' +PACKAGE_VERSION='0.81.3' +PACKAGE_STRING='sysconfig 0.81.3' +PACKAGE_BUGREPORT='http://bugs.opensuse.org' +PACKAGE_URL='https://github.com/openSUSE/sysconfig' ac_unique_file="scripts/ifup" ac_default_prefix=/usr @@ -692,6 +692,7 @@ modprobedir udevrulesdir udevdir +unitdir pppdir init_ddir sysconfig_network_scriptsdir @@ -762,6 +763,7 @@ ac_subst_files='' ac_user_opts=' enable_option_checking +with_unitdir with_udevdir with_fillupdir enable_dependency_tracking @@ -1322,7 +1324,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.7 to adapt to many kinds of systems. +\`configure' configures sysconfig 0.81.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1392,7 +1394,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of sysconfig 0.80.7:";; + short | recursive ) echo "Configuration of sysconfig 0.81.3:";; esac cat <<\_ACEOF @@ -1413,6 +1415,7 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) + --with-unitdir[=PATH] path to the systemd/system unit directory --with-udevdir[=PATH] path to the udev installation directory --with-fillup-templatesdir=name Set the pathname for the fillup templates directory --with-pic[=PKGS] try to use only PIC/non-PIC objects [default=use @@ -1434,7 +1437,8 @@ Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <http://www.suse.de/feedback/>. +Report bugs to <http://bugs.opensuse.org>. +sysconfig home page: <https://github.com/openSUSE/sysconfig>. _ACEOF ac_status=$? fi @@ -1497,7 +1501,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -sysconfig configure 0.80.7 +sysconfig configure 0.81.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1842,9 +1846,9 @@ $as_echo "$as_me: WARNING: $2: section \"Present But Cannot Be Compiled\"" >&2;} { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;} -( $as_echo "## ------------------------------------------- ## -## Report this to http://www.suse.de/feedback/ ## -## ------------------------------------------- ##" +( $as_echo "## --------------------------------------- ## +## Report this to http://bugs.opensuse.org ## +## --------------------------------------- ##" ) | sed "s/^/$as_me: WARNING: /" >&2 ;; esac @@ -1866,7 +1870,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.7, which was +It was created by sysconfig $as_me 0.81.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2694,7 +2698,7 @@ # Define the identity of the package. PACKAGE='sysconfig' - VERSION='0.80.7' + VERSION='0.81.3' cat >>confdefs.h <<_ACEOF @@ -2761,6 +2765,16 @@ +# Check whether --with-unitdir was given. +if test "${with_unitdir+set}" = set; then : + withval=$with_unitdir; +else + with_unitdir='${prefix}/lib/systemd/system' +fi + +unitdir=$with_unitdir + + # Check whether --with-udevdir was given. if test "${with_udevdir+set}" = set; then : withval=$with_udevdir; @@ -12174,7 +12188,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.7, which was +This file was extended by sysconfig $as_me 0.81.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12225,13 +12239,14 @@ Configuration commands: $config_commands -Report bugs to <http://www.suse.de/feedback/>." +Report bugs to <http://bugs.opensuse.org>. +sysconfig home page: <https://github.com/openSUSE/sysconfig>." _ACEOF 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.7 +sysconfig config.status 0.81.3 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.7/configure.in new/sysconfig-0.81.3/configure.in --- old/sysconfig-0.80.7/configure.in 2013-08-14 11:15:24.000000000 +0200 +++ new/sysconfig-0.81.3/configure.in 2013-08-28 18:52:05.000000000 +0200 @@ -1,5 +1,7 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(sysconfig, esyscmd([tr -d '\n' < VERSION]), http://www.suse.de/feedback/) +AC_INIT([sysconfig], esyscmd([tr -d '\n' < VERSION]), + [http://bugs.opensuse.org], [sysconfig], + [https://github.com/openSUSE/sysconfig]) VERSION=$(cat ${srcdir}/VERSION) AC_SUBST(VERSION) @@ -30,6 +32,10 @@ AC_SUBST(init_ddir) AC_SUBST(docdir) AC_SUBST(pppdir) +AC_ARG_WITH([unitdir], [AS_HELP_STRING([--with-unitdir@<:@=PATH@:>@], + [path to the systemd/system unit directory])],, + [with_unitdir='${prefix}/lib/systemd/system']) +AC_SUBST(unitdir, $with_unitdir) AC_ARG_WITH([udevdir], [AS_HELP_STRING([--with-udevdir@<:@=PATH@:>@], [path to the udev installation directory])],, [with_udevdir='${prefix}/lib/udev']) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/doc/Makefile.am new/sysconfig-0.81.3/doc/Makefile.am --- old/sysconfig-0.80.7/doc/Makefile.am 2013-08-12 12:47:03.000000000 +0200 +++ new/sysconfig-0.81.3/doc/Makefile.am 2013-08-26 14:07:16.000000000 +0200 @@ -18,9 +18,8 @@ ifndp-proxy.5 \ routes.5 -doc_DATA = README COPYING Contents Network \ +doc_DATA = COPYING Contents Network \ README.virtualization \ - README.hwcfg_and_device_initialisation \ netconfig.png EXTRA_DIST = $(doc_DATA) $(man_MANS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/doc/Makefile.in new/sysconfig-0.81.3/doc/Makefile.in --- old/sysconfig-0.80.7/doc/Makefile.in 2013-08-14 11:21:26.000000000 +0200 +++ new/sysconfig-0.81.3/doc/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -228,6 +228,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in man_MANS = ifup.8 \ @@ -245,9 +246,8 @@ ifndp-proxy.5 \ routes.5 -doc_DATA = README COPYING Contents Network \ +doc_DATA = COPYING Contents Network \ README.virtualization \ - README.hwcfg_and_device_initialisation \ netconfig.png EXTRA_DIST = $(doc_DATA) $(man_MANS) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/doc/README.hwcfg_and_device_initialisation new/sysconfig-0.81.3/doc/README.hwcfg_and_device_initialisation --- old/sysconfig-0.80.7/doc/README.hwcfg_and_device_initialisation 2012-10-26 14:20:11.000000000 +0200 +++ new/sysconfig-0.81.3/doc/README.hwcfg_and_device_initialisation 1970-01-01 01:00:00.000000000 +0100 @@ -1,29 +0,0 @@ - -This README describes changes in device initialization that were introduced in -openSUSE 10.3 - -In former releases there were device configuration files in -/etc/sysconfig/hardware. These could be used to load special drivers to certain -devices. If there was no config file for a device the best matching driver was -loaded automatically. - -Now we removed /sbin/hw{up,down}. Things are done via udev directly. Device -configuration files /etc/sysconfig/hardware/hwcfg-* are not longer used. - -The automatic module loading did not change much. The only difference is that -udev calls 'modprobe $MODALIAS' directly and not via /bin/hwup as before. - -To learn more about this topic have a look at these files, man-pages and tools: - - /etc/udev/rules.d/80-drivers.rules - - man udev - - udevmonitor, udevtest, udevinfo - - /lib/modules/<kernelversion>/modules.alias - - /sys/bus/*/devices/*/modalias - - man modprobe - - modprobe -nv --show-depends `cat /sys/bus/pci/devices/..../modalias` - -Module parameters can be specified in /etc/modprobe.conf.local, e.g. as: - - options <module name> <module options> - - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/scripts/Makefile.in new/sysconfig-0.81.3/scripts/Makefile.in --- old/sysconfig-0.80.7/scripts/Makefile.in 2013-08-14 11:21:26.000000000 +0200 +++ new/sysconfig-0.81.3/scripts/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -265,6 +265,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in SUBDIRS = hardware netconfig.d diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/scripts/dhcpcd-hook new/sysconfig-0.81.3/scripts/dhcpcd-hook --- old/sysconfig-0.80.7/scripts/dhcpcd-hook 2013-05-16 10:35:17.000000000 +0200 +++ new/sysconfig-0.81.3/scripts/dhcpcd-hook 2013-09-09 15:28:08.000000000 +0200 @@ -174,7 +174,11 @@ # check if hostname changed and reload syslog when needed if hostname_changed ; then # reload syslog so it knows the new hostname - /etc/init.d/syslog reload + if test -x /usr/bin/systemctl ; then + /usr/bin/systemctl reload syslog.service + else + /etc/init.d/syslog reload + fi fi $debug && $log_dbg "Running ifup $INTERFACE -o dhcp" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/scripts/hardware/Makefile.in new/sysconfig-0.81.3/scripts/hardware/Makefile.in --- old/sysconfig-0.80.7/scripts/hardware/Makefile.in 2013-08-14 11:21:27.000000000 +0200 +++ new/sysconfig-0.81.3/scripts/hardware/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -222,6 +222,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in sysconfig_hardware_SCRIPTS = diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/scripts/ifup new/sysconfig-0.81.3/scripts/ifup --- old/sysconfig-0.80.7/scripts/ifup 2013-08-12 13:07:52.000000000 +0200 +++ new/sysconfig-0.81.3/scripts/ifup 2013-09-09 15:28:08.000000000 +0200 @@ -199,10 +199,42 @@ message "interface '$INTERFACE' is a wlan helper interface. Exiting."; exit $R_SUCCESS fi +declare -r _INTERFACETYPE="$INTERFACETYPE" + + +###################################################################### +# Now source the configuration file and check if we have an interface +# +INTERFACETYPE="" +if [ -n "$CONFIG" ] ; then + source_iface_config "$CONFIG" + + # Complain when INTERFACETYPE is set in the config + # and ask the user to report a bug as it should be + # used only when detection fails, _not_ by default. + if test "X$INTERFACETYPE" != "X" ; then + IM=`printf " %-9s" $INTERFACE` + BM=`printf " %-9s" "" " Please open a bug report."` + if test "X$INTERFACETYPE" = "X$_INTERFACETYPE" ; then + logerror "$IM Warning: ifcfg-$CONFIG"\ + "overrides interface type detection.\n$BM" + else + logerror "$IM Warning: ifcfg-$CONFIG"\ + "modifies interface type from"\ + "'$_INTERFACETYPE' to '$INTERFACETYPE'.\n$BM" + fi + fi + + # Store config name persistently for use in ifplugd-selectif after + # interface has gone. Without that info it will not activate + # alternative interface in this case. Used in get_ifplugd_priority() + echo $CONFIG > $RUN_FILES_BASE/config-$INTERFACE +fi +test "X$INTERFACETYPE" = "X" && export INTERFACETYPE="$_INTERFACETYPE" ###################################################################### -# Set renamed flag for this interface +# Set renamed flag for this interface while hotplug event # # This is needed if ifup is called via udev before rcnetwork was started. # Without this flag rcnetwork does not know if renaming was completed and @@ -229,11 +261,11 @@ exit $R_SUCCESS ;; esac - fi - # check if service network was started and skip ifup in auto mode - if [ "$MODE" = auto ] && ! netcontrol_running ; then - message "Service network not started and mode 'auto' -> skipping" - exit $R_SUCCESS + # check if service network was started and skip ifup in auto mode + if ! netcontrol_running ; then + message "Service network not started -> skipping" + exit $R_SUCCESS + fi fi fi @@ -246,45 +278,50 @@ mesg "Network is managed by '$network_service_id' -> skipping" exit $R_NOTIMPL fi -case $SCRIPTNAME in -ifup) - # start everything in network service cgroup - if ! in_network_service_cgroup ; then - add_to_network_service_cgroup - fi + +###################################################################### +# Read temporary startmode which may be set by iscsi, ... subsystems +# serving root-fs and cleanup aliases and hotplug [handled already]. +# +case "$SCRIPTNAME" in +ifup|ifdown) + tmp_startmode=`read_cached_config_data startmode $INTERFACE` + [ -n "$tmp_startmode" ] && STARTMODE="$tmp_startmode" ;; esac +case "$STARTMODE" in +"") STARTMODE=manual;; +on|boot|onboot|hotplug) STARTMODE=auto ;; +esac ###################################################################### -# Now source the configuration file and check if we have an interface +# Check how to handle arguments and redirect to systemd when needed # -declare -r _INTERFACETYPE="$INTERFACETYPE" -INTERFACETYPE="" -if [ -n "$CONFIG" ] ; then - source_iface_config "$CONFIG" - - # Complain when INTERFACETYPE is set in the config - # and ask the user to report a bug as it should be - # used only when detection fails, _not_ by default. - if test "X$INTERFACETYPE" != "X" ; then - IM=`printf " %-9s" $INTERFACE` - BM=`printf " %-9s" "" " Please open a bug report."` - if test "X$INTERFACETYPE" = "X$_INTERFACETYPE" ; then - logerror "$IM Warning: ifcfg-$CONFIG"\ - "overrides interface type detection.\n$BM" - else - logerror "$IM Warning: ifcfg-$CONFIG"\ - "modifies interface type from"\ - "'$_INTERFACETYPE' to '$INTERFACETYPE'.\n$BM" +case $SCRIPTNAME in +ifup) + case "$STARTMODE" in + off|manual) + if test "$HOTPLUG" = "yes" -o "$BOOTING" = "yes" ; then + message "`printf " %-9s Startmode is '%s' -> skipping" $INTERFACE $STARTMODE`" + exit $R_NOTCONFIGURED fi + ;; + esac + + if test $PPID -ne 1 -a "$INTERFACE" != "lo" -a "$DHCP" != yes ; then + exec systemctl start "network@${INTERFACE}.service" + fi +;; +ifdown) + if test $PPID -ne 1 -a "$INTERFACE" != "lo" -a "$DHCP" != yes ; then + exec systemctl stop "network@${INTERFACE}.service" fi - # Store config name persistently for use in ifplugd-selectif after - # interface has gone. Without that info it will not activate - # alternative interface in this case. Used in get_ifplugd_priority() - echo $CONFIG > $RUN_FILES_BASE/config-$INTERFACE -fi -test "X$INTERFACETYPE" = "X" && export INTERFACETYPE="$_INTERFACETYPE" + # /etc/init.d/network has been killed, don't stop + test -e "${RUN_FILES_BASE}/killed" && exit 0 +;; +esac + ###################################################################### # Check if the interface is available @@ -572,8 +609,8 @@ ###################################################################### # read possibly stored provider # -# If we don't know a provider name, let's have a look if a provider was stored -# in the runtime data cache for this configuration. +# If we don't know a provider name, let's have a look if a provider was +# stored in the runtime data cache for this configuration. if [ "$SCRIPTNAME" != ifdown -a -z "$PROVIDER" ] ; then PROVIDER=`read_cached_config_data provider $INTERFACE` fi @@ -584,11 +621,6 @@ # # STARTMODE is from config file; MODE is current mode # -# Read temporary startmode -if [ "$SCRIPTNAME" = ifdown ] ; then - tmp_startmode=`read_cached_config_data startmode $INTERFACE` - [ -n "$tmp_startmode" ] && STARTMODE="$tmp_startmode" -fi ###################################################################### # handle bonding slave "up" hotplugging event @@ -610,10 +642,6 @@ fi fi -test "$STARTMODE" = "on" && STARTMODE=auto -test "$STARTMODE" = "boot" && STARTMODE=auto -test "$STARTMODE" = "onboot" && STARTMODE=auto -test "$STARTMODE" = "hotplug" && STARTMODE=auto if [ "$STARTMODE" = "nfsroot" ] ; then STARTMODE=auto # if this interface serves nfs root, then don't shut it down via rcnetwork @@ -637,7 +665,6 @@ exit $R_DHCP_BG fi fi -test -z "$STARTMODE" && STARTMODE=manual if [ "$SCRIPTNAME" = ifup ] ; then case "$MODE:$STARTMODE" in force:*) : go on ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/scripts/netconfig.d/Makefile.in new/sysconfig-0.81.3/scripts/netconfig.d/Makefile.in --- old/sysconfig-0.80.7/scripts/netconfig.d/Makefile.in 2013-08-14 11:21:27.000000000 +0200 +++ new/sysconfig-0.81.3/scripts/netconfig.d/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -222,6 +222,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in netconfig_d_scripts_SCRIPTS = dns-bind dns-resolver dns-dnsmasq nis ntp-runtime diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/scripts/network new/sysconfig-0.81.3/scripts/network --- old/sysconfig-0.80.7/scripts/network 2013-08-14 11:15:24.000000000 +0200 +++ new/sysconfig-0.81.3/scripts/network 2013-09-09 15:28:08.000000000 +0200 @@ -119,6 +119,20 @@ || exit $R_INTERNAL +kill_all_instances() +{ + local s l + + l=`systemctl show -p ConsistsOf network.service 2>/dev/null` + for s in ${l#ConsistsOf=} ; do + case $s in + network@*.service) + /bin/systemctl "$@" kill "$s" + ;; + esac + done +} + # # Check if to redirect to systemd or not # @@ -148,15 +162,16 @@ # suspend, but don't do anything when not running netcontrol_running || exit 0 - # kill hard to avoid deconfiguration - opts=($SYSTEMCTL_OPTIONS "--signal=9") - SYSTEMCTL_OPTIONS="${opts[*]}" - # set a kill flag rm -f "${RUN_FILES_BASE}/killed" echo "$ACTION" > "${RUN_FILES_BASE}/killed" - # and map both to kill + # kill hard to avoid deconfiguration + opts=($SYSTEMCTL_OPTIONS "--signal=9") + SYSTEMCTL_OPTIONS="${opts[*]}" + kill_all_instances --signal=9 + + # and map it to kill ACTION="kill" unset TYPE SKIP INTERFACE CONFIG OPTIONS ;; @@ -164,13 +179,14 @@ # resume, but don't do anything when not running netcontrol_running || exit 0 - # kill hard to avoid deconfiguration - /bin/systemctl --signal=9 kill network.service - # set a kill flag rm -f "${RUN_FILES_BASE}/killed" echo "$ACTION" > "${RUN_FILES_BASE}/killed" + # kill hard to avoid deconfiguration + kill_all_instances --signal=9 + /bin/systemctl --signal=9 kill network.service + # and map it to restart (start has no effect), # so systemd resets its state ... ACTION="restart" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/sysconfig.spec new/sysconfig-0.81.3/sysconfig.spec --- old/sysconfig-0.80.7/sysconfig.spec 2013-08-14 11:21:29.000000000 +0200 +++ new/sysconfig-0.81.3/sysconfig.spec 2013-09-09 15:55:19.000000000 +0200 @@ -18,21 +18,13 @@ Name: sysconfig -Version: 0.80.7 +Version: 0.81.3 Release: 0 -Summary: The sysconfig scheme and traditional network scripts +Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ Group: System/Base -Url: http://gitorious.org/opensuse/sysconfig +Url: https://github.com/openSUSE/sysconfig PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep -# we may create these automatically from rpm later -Provides: sysvinit(network) -Requires: bridge-utils -Requires: dbus-1 -Requires: iproute2 -Requires: procps -Requires: tunctl -Requires: vlan BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 @@ -42,9 +34,14 @@ %define udevdir /lib/udev %endif Source: %name-%version.tar.bz2 +Requires: /sbin/ifup +Requires: /sbin/netconfig +Requires: sysvinit(network) +Requires: udevmountd = %{version} +Recommends: sysconfig-network = %{version} %description -This package provides the SuSE system configuration scheme and the +This package provides the SuSE system configuration scheme for the traditional "ifup" alias "netcontrol" network scripts. Authors: @@ -57,8 +54,70 @@ Michal Svec <msvec@suse.cz> Christian Zoz <zoz@suse.de> Werner Fink <werner@suse.de> + Hannes Reinecke <hare@suse.de> + Marius Tomaschewski <mt@suse.de> + +%package -n udevmountd +Summary: Automount daemon for udev +Group: System/Base +Requires(pre): sysconfig = %{version} + +%description -n udevmountd +This package provides the udev mount daemon and its udev rule. + +Authors: +-------- + Hannes Reinecke <hare@suse.de> + + +%package netconfig +Summary: Script to apply network provided settings +Group: System/Base +Requires(pre): sysconfig = %{version} +Provides: /sbin/netconfig + +%description netconfig +This package provides the netconfig scripts to apply network +provided settings like DNS or NIS into system files. + +Authors: +-------- + Michael Calmer <mc@suse.de> + Marius Tomaschewski <mt@suse.de> + Milisav Radmanic <radmanic@suse.de> + + +%package network +Summary: Traditional network scripts +Group: System/Base +Requires(pre): sysconfig = %{version} +Requires: bridge-utils +Requires: iproute2 +Requires: procps +Requires: tunctl +Requires: vlan +Requires: /sbin/netconfig +Provides: /sbin/ifup +Conflicts: otherproviders(/sbin/ifup) + +%description network +This package provides the traditional "ifup" alias "netcontrol" +network scripts. + +Authors: +-------- + Olaf Kirch <okir@suse.de> + Bjoern Jacke <bjoern@j3e.de> + Mads Martin Joergensen <mmj@suse.de> + Peter Poeml <poeml@suse.de> + Arvin Schnell <arvin@suse.de> + Michal Svec <msvec@suse.cz> + Christian Zoz <zoz@suse.de> + Werner Fink <werner@suse.de> + Hannes Reinecke <hare@suse.de> Marius Tomaschewski <mt@suse.de> + %prep %setup -n sysconfig-%{version} @@ -70,6 +129,7 @@ --libdir=/%_lib \ --sysconfdir=%_sysconfdir \ --mandir=%_mandir \ + --with-unitdir=%_unitdir \ --with-udevdir=%udevdir \ --with-fillup-templatesdir=/var/adm/fillup-templates %{__make} %{?_smp_mflags} @@ -89,36 +149,69 @@ %files %defattr(-,root,root) -/etc/init.d/* +%dir /etc/modprobe.d +%config /etc/modprobe.d/50-blacklist.conf +%config /etc/sysconfig/network/ifcfg.template %ghost /etc/sysconfig/network/config %ghost /etc/sysconfig/network/dhcp %config(noreplace) %attr(600,root,root) /etc/sysconfig/network/ifcfg-lo %config(noreplace) /etc/sysconfig/network/ifroute-lo +%dir /usr/share/doc/packages/sysconfig +%doc /usr/share/doc/packages/sysconfig/Contents +%doc /usr/share/doc/packages/sysconfig/COPYING + +%files network +%defattr(-,root,root) %config(noreplace) /etc/ppp/ip-up %config(noreplace) /etc/ppp/ip-down %config(noreplace) /etc/ppp/ipv6-up %config(noreplace) /etc/ppp/ipv6-down -%dir %udevdir -%udevdir/udevmountd -%dir %udevdir/rules.d +/etc/ppp/poll.tcpip %udevdir/rules.d/77-network.rules -%udevdir/rules.d/81-mount.rules -%dir /etc/modprobe.d -%config /etc/sysconfig/network/ifcfg.template -%config /etc/modprobe.d/50-blacklist.conf -/etc/sysconfig/network/scripts/* +/etc/sysconfig/network/scripts/functions +/etc/sysconfig/network/scripts/functions.common +/etc/sysconfig/network/scripts/functions.rpm-utils +/etc/sysconfig/network/scripts/extradebug +/etc/sysconfig/network/scripts/if* +/etc/sysconfig/network/scripts/convert* +/etc/sysconfig/network/scripts/move_shm_sysconfig.sh +/etc/sysconfig/network/scripts/create-ifservices-directory +/etc/sysconfig/network/scripts/dhcpcd-hook +/etc/sysconfig/network/scripts/link_wait /etc/sysconfig/network/if-up.d/ndp-proxy /etc/sysconfig/network/if-down.d/ndp-proxy -/etc/netconfig.d -/etc/ppp/poll.tcpip -/sbin/* -%doc /usr/share/doc/packages/sysconfig -%_mandir/*/* /usr/share/omc/svcinfo.d/network.xml /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-network +%dir /usr/share/doc/packages/sysconfig +%doc /usr/share/doc/packages/sysconfig/Network +%doc /usr/share/doc/packages/sysconfig/README* +%_mandir/*/if* +%_mandir/*/routes* +%_unitdir/network@.service +%_unitdir/network.service +/etc/init.d/network +/sbin/if* +/sbin/autoip +/sbin/rcnetwork + +%files netconfig +%defattr(-,root,root) +%dir /etc/netconfig.d +/etc/netconfig.d/* +/etc/sysconfig/network/scripts/functions.netconfig +/sbin/netconfig +/usr/share/man/man8/netconfig.8.gz +%doc /usr/share/doc/packages/sysconfig/netconfig.png + +%files -n udevmountd +%defattr(-,root,root) +%dir %udevdir +%udevdir/udevmountd +%dir %udevdir/rules.d +%udevdir/rules.d/81-mount.rules -%pre +%pre network # package update ? if [ ${1:-0} -gt 1 ]; then # update to >= 0.72.1 (-> openSUSE 11.2) @@ -137,7 +230,7 @@ fi fi -%post +%post network # * update to >= 0.72.1: before anything else, move state # files from dev/shm/sysconfig to dev/.sysconfig/network if [ -f etc/sysconfig/network/__move_shm_sysconfig__ ] ; then @@ -186,6 +279,7 @@ chmod 0600 etc/sysconfig/network/ifcfg-* # bnc#803058: migrate from NETWORKMANAGER=yes/no variable to # network.service alias link masking rcnetwork. +enable=yes if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x /usr/bin/systemctl ] ; then . /dev/.sysconfig/network/migrate_nm_variable case $NETWORKMANAGER in @@ -201,18 +295,30 @@ # 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 || : + enable=no ;; esac else # cleanup obsolete NETWORKMANAGER variable sysconfig_remove_and_set network/config NETWORKMANAGER fi +if test "$enable" = "yes" -a -x /usr/bin/systemctl ; then + _id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || : + case "${_id#Id=}" in + ""|network.service) + /usr/bin/systemctl --system daemon-reload || : + /usr/bin/systemctl --force enable network.service || : + ;; + esac +fi -%postun +%postun network %{insserv_cleanup} /sbin/ldconfig -%preun -%{stop_on_removal network} +%preun network +if test "$1" = "0" -a -x /etc/init.d/network ; then + /etc/init.d/network stop-all-dhcp-clients || : +fi %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/sysconfig.spec.in new/sysconfig-0.81.3/sysconfig.spec.in --- old/sysconfig-0.80.7/sysconfig.spec.in 2013-08-14 11:15:24.000000000 +0200 +++ new/sysconfig-0.81.3/sysconfig.spec.in 2013-09-09 15:28:08.000000000 +0200 @@ -20,19 +20,11 @@ Name: sysconfig Version: @VERSION@ Release: 0 -Summary: The sysconfig scheme and traditional network scripts +Summary: The sysconfig scheme for traditional network scripts License: GPL-2.0+ Group: System/Base -Url: http://gitorious.org/opensuse/sysconfig +Url: https://github.com/openSUSE/sysconfig PreReq: %fillup_prereq %insserv_prereq textutils fileutils gawk sed grep -# we may create these automatically from rpm later -Provides: sysvinit(network) -Requires: bridge-utils -Requires: dbus-1 -Requires: iproute2 -Requires: procps -Requires: tunctl -Requires: vlan BuildRequires: libtool BuildRoot: %{_tmppath}/%{name}-%{version}-build %if 0%{?suse_version} >= 1230 @@ -42,9 +34,14 @@ %define udevdir /lib/udev %endif Source: %name-%version.tar.bz2 +Requires: /sbin/ifup +Requires: /sbin/netconfig +Requires: sysvinit(network) +Requires: udevmountd = %{version} +Recommends: sysconfig-network = %{version} %description -This package provides the SuSE system configuration scheme and the +This package provides the SuSE system configuration scheme for the traditional "ifup" alias "netcontrol" network scripts. Authors: @@ -57,8 +54,70 @@ Michal Svec <msvec@suse.cz> Christian Zoz <zoz@suse.de> Werner Fink <werner@suse.de> + Hannes Reinecke <hare@suse.de> + Marius Tomaschewski <mt@suse.de> + +%package -n udevmountd +Summary: Automount daemon for udev +Group: System/Base +Requires(pre): sysconfig = %{version} + +%description -n udevmountd +This package provides the udev mount daemon and its udev rule. + +Authors: +-------- + Hannes Reinecke <hare@suse.de> + + +%package netconfig +Summary: Script to apply network provided settings +Group: System/Base +Requires(pre): sysconfig = %{version} +Provides: /sbin/netconfig + +%description netconfig +This package provides the netconfig scripts to apply network +provided settings like DNS or NIS into system files. + +Authors: +-------- + Michael Calmer <mc@suse.de> + Marius Tomaschewski <mt@suse.de> + Milisav Radmanic <radmanic@suse.de> + + +%package network +Summary: Traditional network scripts +Group: System/Base +Requires(pre): sysconfig = %{version} +Requires: bridge-utils +Requires: iproute2 +Requires: procps +Requires: tunctl +Requires: vlan +Requires: /sbin/netconfig +Provides: /sbin/ifup +Conflicts: otherproviders(/sbin/ifup) + +%description network +This package provides the traditional "ifup" alias "netcontrol" +network scripts. + +Authors: +-------- + Olaf Kirch <okir@suse.de> + Bjoern Jacke <bjoern@j3e.de> + Mads Martin Joergensen <mmj@suse.de> + Peter Poeml <poeml@suse.de> + Arvin Schnell <arvin@suse.de> + Michal Svec <msvec@suse.cz> + Christian Zoz <zoz@suse.de> + Werner Fink <werner@suse.de> + Hannes Reinecke <hare@suse.de> Marius Tomaschewski <mt@suse.de> + %prep %setup -n sysconfig-%{version} @@ -70,6 +129,7 @@ --libdir=/%_lib \ --sysconfdir=%_sysconfdir \ --mandir=%_mandir \ + --with-unitdir=%_unitdir \ --with-udevdir=%udevdir \ --with-fillup-templatesdir=/var/adm/fillup-templates %{__make} %{?_smp_mflags} @@ -89,36 +149,69 @@ %files %defattr(-,root,root) -/etc/init.d/* +%dir /etc/modprobe.d +%config /etc/modprobe.d/50-blacklist.conf +%config /etc/sysconfig/network/ifcfg.template %ghost /etc/sysconfig/network/config %ghost /etc/sysconfig/network/dhcp %config(noreplace) %attr(600,root,root) /etc/sysconfig/network/ifcfg-lo %config(noreplace) /etc/sysconfig/network/ifroute-lo +%dir /usr/share/doc/packages/sysconfig +%doc /usr/share/doc/packages/sysconfig/Contents +%doc /usr/share/doc/packages/sysconfig/COPYING + +%files network +%defattr(-,root,root) %config(noreplace) /etc/ppp/ip-up %config(noreplace) /etc/ppp/ip-down %config(noreplace) /etc/ppp/ipv6-up %config(noreplace) /etc/ppp/ipv6-down -%dir %udevdir -%udevdir/udevmountd -%dir %udevdir/rules.d +/etc/ppp/poll.tcpip %udevdir/rules.d/77-network.rules -%udevdir/rules.d/81-mount.rules -%dir /etc/modprobe.d -%config /etc/sysconfig/network/ifcfg.template -%config /etc/modprobe.d/50-blacklist.conf -/etc/sysconfig/network/scripts/* +/etc/sysconfig/network/scripts/functions +/etc/sysconfig/network/scripts/functions.common +/etc/sysconfig/network/scripts/functions.rpm-utils +/etc/sysconfig/network/scripts/extradebug +/etc/sysconfig/network/scripts/if* +/etc/sysconfig/network/scripts/convert* +/etc/sysconfig/network/scripts/move_shm_sysconfig.sh +/etc/sysconfig/network/scripts/create-ifservices-directory +/etc/sysconfig/network/scripts/dhcpcd-hook +/etc/sysconfig/network/scripts/link_wait /etc/sysconfig/network/if-up.d/ndp-proxy /etc/sysconfig/network/if-down.d/ndp-proxy -/etc/netconfig.d -/etc/ppp/poll.tcpip -/sbin/* -%doc /usr/share/doc/packages/sysconfig -%_mandir/*/* /usr/share/omc/svcinfo.d/network.xml /var/adm/fillup-templates/sysconfig.dhcp-network /var/adm/fillup-templates/sysconfig.config-network +%dir /usr/share/doc/packages/sysconfig +%doc /usr/share/doc/packages/sysconfig/Network +%doc /usr/share/doc/packages/sysconfig/README* +%_mandir/*/if* +%_mandir/*/routes* +%_unitdir/network@.service +%_unitdir/network.service +/etc/init.d/network +/sbin/if* +/sbin/autoip +/sbin/rcnetwork + +%files netconfig +%defattr(-,root,root) +%dir /etc/netconfig.d +/etc/netconfig.d/* +/etc/sysconfig/network/scripts/functions.netconfig +/sbin/netconfig +/usr/share/man/man8/netconfig.8.gz +%doc /usr/share/doc/packages/sysconfig/netconfig.png + +%files -n udevmountd +%defattr(-,root,root) +%dir %udevdir +%udevdir/udevmountd +%dir %udevdir/rules.d +%udevdir/rules.d/81-mount.rules -%pre +%pre network # package update ? if [ ${1:-0} -gt 1 ]; then # update to >= 0.72.1 (-> openSUSE 11.2) @@ -137,7 +230,7 @@ fi fi -%post +%post network # * update to >= 0.72.1: before anything else, move state # files from dev/shm/sysconfig to dev/.sysconfig/network if [ -f etc/sysconfig/network/__move_shm_sysconfig__ ] ; then @@ -186,6 +279,7 @@ chmod 0600 etc/sysconfig/network/ifcfg-* # bnc#803058: migrate from NETWORKMANAGER=yes/no variable to # network.service alias link masking rcnetwork. +enable=yes if [ -f /dev/.sysconfig/network/migrate_nm_variable -a -x /usr/bin/systemctl ] ; then . /dev/.sysconfig/network/migrate_nm_variable case $NETWORKMANAGER in @@ -201,18 +295,30 @@ # 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 || : + enable=no ;; esac else # cleanup obsolete NETWORKMANAGER variable sysconfig_remove_and_set network/config NETWORKMANAGER fi +if test "$enable" = "yes" -a -x /usr/bin/systemctl ; then + _id=`/usr/bin/systemctl --no-pager -p Id show network.service 2>/dev/null` || : + case "${_id#Id=}" in + ""|network.service) + /usr/bin/systemctl --system daemon-reload || : + /usr/bin/systemctl --force enable network.service || : + ;; + esac +fi -%postun +%postun network %{insserv_cleanup} /sbin/ldconfig -%preun -%{stop_on_removal network} +%preun network +if test "$1" = "0" -a -x /etc/init.d/network ; then + /etc/init.d/network stop-all-dhcp-clients || : +fi %changelog diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/sysconfig-0.80.7/tools/Makefile.in new/sysconfig-0.81.3/tools/Makefile.in --- old/sysconfig-0.80.7/tools/Makefile.in 2013-08-14 11:21:27.000000000 +0200 +++ new/sysconfig-0.81.3/tools/Makefile.in 2013-09-09 15:55:17.000000000 +0200 @@ -225,6 +225,7 @@ top_srcdir = @top_srcdir@ udevdir = @udevdir@ udevrulesdir = @udevrulesdir@ +unitdir = @unitdir@ CLEANFILES = *~ MAINTAINERCLEANFILES = Makefile.in ifuser_SOURCES = ifuser.c -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠hilbert.suse.de