diff --git a/.gitignore b/.gitignore index 5e6829e..e262716 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/initscripts-9.49.37.tar.bz2 +SOURCES/initscripts-9.49.39.tar.gz diff --git a/.initscripts.metadata b/.initscripts.metadata index 32e7e20..a79f9ff 100644 --- a/.initscripts.metadata +++ b/.initscripts.metadata @@ -1 +1 @@ -13c791c3da04f1a7f0aed0c90a573a8fe7c44ca8 SOURCES/initscripts-9.49.37.tar.bz2 +5b1ff27004dc3f61a476341f5eeea4b0bdfe8acf SOURCES/initscripts-9.49.39.tar.gz diff --git a/SOURCES/initscripts-9.03.58-use-dbus-instead-of-nmcli.patch b/SOURCES/initscripts-9.03.58-use-dbus-instead-of-nmcli.patch deleted file mode 100644 index e486ce3..0000000 --- a/SOURCES/initscripts-9.03.58-use-dbus-instead-of-nmcli.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 44b84c4b92705917f7c124b714bc93ca42e00ec3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Hor=C3=A1=C4=8Dek?= -Date: Mon, 30 Jan 2017 18:47:11 +0100 -Subject: [PATCH 1/2] network: check for running NetworkManager via dbus - -Use dbus instead of nmcli to make ifup command faster. ---- - sysconfig/network-scripts/network-functions | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 9cca982..c1da988 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -275,7 +275,11 @@ do_netreport () - - is_nm_running () - { -- [ "$(LANG=C nmcli -t --fields running general status 2>/dev/null)" = "running" ] -+ dbus-send --system --print-reply \ -+ --dest=org.freedesktop.DBus \ -+ /org/freedesktop/DBus \ -+ org.freedesktop.DBus.GetNameOwner \ -+ string:"org.freedesktop.NetworkManager" >/dev/null 2>&1 - } - - is_nm_active () --- -2.9.3 - - -From 5329e1457eb6be7121eeee3a4e18bbe82d6ea460 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Petr=20Hor=C3=A1=C4=8Dek?= -Date: Mon, 30 Jan 2017 18:48:10 +0100 -Subject: [PATCH 2/2] network: load NetworkManager connection via dbus - -Use dbus to refresh configuration files for NetworkManager in order -to make ifup and ifdown faster. ---- - sysconfig/network-scripts/network-functions | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index c1da988..8a79802 100644 ---- a/sysconfig/network-scripts/network-functions -+++ b/sysconfig/network-scripts/network-functions -@@ -171,7 +171,7 @@ source_config () - ISALIAS=no - fi - if is_nm_running && [ "$REALDEVICE" != "lo" ] ; then -- nmcli con load "/etc/sysconfig/network-scripts/$CONFIG" -+ nm_con_load "$CONFIG" - if ! is_false $NM_CONTROLLED; then - UUID=$(get_uuid_by_config $CONFIG) - [ -n "$UUID" ] && _use_nm=true -@@ -179,6 +179,14 @@ source_config () - fi - } - -+nm_con_load () { -+ dbus-send --system --print-reply \ -+ --dest=org.freedesktop.NetworkManager \ -+ /org/freedesktop/NetworkManager/Settings \ -+ org.freedesktop.NetworkManager.Settings.LoadConnections \ -+ array:string:"/etc/sysconfig/network-scripts/${1}" >/dev/null 2>&1 -+} -+ - ethtool_set() - { - oldifs=$IFS; --- -2.9.3 - diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec index f8b7096..6b81095 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -1,12 +1,12 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 9.49.37 +Version: 9.49.39 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base -Release: 1%{?dist}.1 -URL: http://fedorahosted.org/releases/i/n/initscripts/ -Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2 +Release: 1%{?dist} +URL: https://github.com/fedora-sysv/initscripts +Source: https://github.com/fedora-sysv/initscripts/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Obsoletes: initscripts-legacy <= 9.39 Requires: /bin/awk, sed, coreutils @@ -18,7 +18,7 @@ Requires: bash >= 3.0 Requires: sysvinit-tools >= 2.87-5 Conflicts: systemd < 23-1 Conflicts: systemd-units < 23-1 -Conflicts: lvm2 < 2.02.98-3 +Conflicts: lvm2 < 2.02.100-5 Conflicts: dmraid < 1.0.0.rc16-18 Requires: systemd Requires: iproute, /sbin/arping, findutils @@ -35,8 +35,6 @@ Requires(preun): /sbin/chkconfig BuildRequires: glib2-devel popt-devel gettext pkgconfig Provides: /sbin/service -Patch001: initscripts-9.03.58-use-dbus-instead-of-nmcli.patch - %description The initscripts package contains basic system scripts used during a boot of the system. It also contains scripts which @@ -55,7 +53,6 @@ Currently, this consists of various memory checking code. %prep %setup -q -%patch001 -p1 %build make @@ -157,9 +154,9 @@ rm -rf $RPM_BUILD_ROOT /etc/sysconfig/network-scripts/ifup-ctc %endif %config(noreplace) /etc/networks -/etc/rwtab +%config(noreplace) /etc/rwtab +%config(noreplace) /etc/statetab %dir /etc/rwtab.d -/etc/statetab %dir /etc/statetab.d /usr/lib/systemd/rhel-* /usr/lib/systemd/system/* @@ -221,8 +218,34 @@ rm -rf $RPM_BUILD_ROOT /etc/profile.d/debug* %changelog -* Thu Feb 16 2017 David Kaspar [Dee'Kej] - 9.49.37-1.el7_3.1 -- use DBUS calls directly instead of calling nmcli (bug #1422820) +* Wed May 03 2017 David Kaspar [Dee'Kej] - 9.49.39-1 +- sysconfig.txt: mention previously introduced NO_DHCP_HOSTNAME option +- DHCP_FQDN and DHCP_SEND_HOSTNAME introduced +- re-add missing $HOSTNAME initialization +- ifup: add support for VLAN_EGRESS_PRIORITY_MAP +- rhel-autorelabel: synchronize cached writes before reboot + +* Thu Mar 30 2017 David Kaspar [Dee'Kej] - 9.49.38-1 +- ifdown-eth: we need to flush global scope as well +- killproc/status: add missing '-b ' option +- specfile: mark 'rwtab' and 'statetab' as config files +- spec: we need newer lvm +- rwtab: add /var/lib/systemd/timers +- ifup-eth: remove quote marks +- 9.70-sync: Move everything to github +- 9.70-sync: rwtab updated +- 9.70-sync: service file updated +- 9.70-sync: syconfig.txt updated +- 9.70-sync: systemd/rhel-import-state updated +- 9.70-sync: sysconfig/network-scripts/* updated - part 2 +- 9.70-sync: sysconfig/network-scripts/* updated - part 1 +- 9.70-sync: rc.d/init.d/network updated +- 9.70-sync: rc.d/init.d/netconsole updated +- 9.70-sync: rc.d/init.d/functions updated +- 9.70-sync: ipv6-6to4.howto example updated +- 9.70-sync: examples/networking/ifcfg-bridge updated +- network: load NetworkManager connection via dbus +- network: check for running NetworkManager via dbus * Mon Sep 12 2016 Lukáš Nykrýn - 9.49.37-1 - rhel-import-state: fix broken order of parameters