diff --git a/base/initscripts/centos/meta_patches/PATCH_ORDER b/base/initscripts/centos/meta_patches/PATCH_ORDER index db1bb2e48..c8393065d 100644 --- a/base/initscripts/centos/meta_patches/PATCH_ORDER +++ b/base/initscripts/centos/meta_patches/PATCH_ORDER @@ -10,7 +10,6 @@ run-ifdown-on-all-interfaces.patch spec-sysconfig-affirmative-check-for-link-carrier.patch spec-sysconfig-unsafe-usage-of-linkdelay-variable.patch fix-build-failures-due-to-unwanted-sgid.patch -add_build_require_on_systemd.patch ipv6-static-route-support.patch spec-ifup-eth-stop-waiting-if-link-is-up.patch spec-run-dhclient-as-daemon-for-ipv6.patch diff --git a/base/initscripts/centos/meta_patches/add_build_require_on_systemd.patch b/base/initscripts/centos/meta_patches/add_build_require_on_systemd.patch deleted file mode 100644 index 8a7ccab23..000000000 --- a/base/initscripts/centos/meta_patches/add_build_require_on_systemd.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 075dd032f651d469e639eb1f25f3d5b7f5ff5485 Mon Sep 17 00:00:00 2001 -From: Scott Little -Date: Mon, 2 Oct 2017 14:49:27 -0400 -Subject: [PATCH 13/13] WRS: add_build_require_on_systemd.patch - ---- - SPECS/initscripts.spec | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index 09674a7..cdc282e 100644 ---- a/SPECS/initscripts.spec -+++ b/SPECS/initscripts.spec -@@ -41,6 +41,7 @@ Requires(pre): /usr/sbin/groupadd - Requires(post): /sbin/chkconfig, coreutils - Requires(preun): /sbin/chkconfig - BuildRequires: glib2-devel popt-devel gettext pkgconfig -+BuildRequires: systemd-devel - Provides: /sbin/service - - Patch4: support-interface-scriptlets.patch --- -1.9.1 - diff --git a/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch b/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch index 94978afbd..143a749d6 100644 --- a/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch +++ b/base/initscripts/centos/meta_patches/fix-build-failures-due-to-unwanted-sgid.patch @@ -1,25 +1,17 @@ -From 8351b22a5a517ebe779d4bf4904694bd1bd85890 Mon Sep 17 00:00:00 2001 +From 2c096cfd84fea55fd1f2df466d5635c06daab2a2 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 14:49:27 -0400 -Subject: [PATCH 12/13] WRS: fix-build-failures-due-to-unwanted-sgid.patch +Subject: [PATCH] WRS: fix-build-failures-due-to-unwanted-sgid.patch --- - SPECS/initscripts.spec | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) + SPECS/initscripts.spec | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index f2d0271..09674a7 100644 +index 938e9bb..e60c826 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec -@@ -197,6 +197,7 @@ rm -rf $RPM_BUILD_ROOT - %dir /etc/rwtab.d - %dir /etc/statetab.d - /usr/lib/systemd/rhel-* -+%dir %attr(0755,root,root) /usr/lib/systemd/system/*wants - /usr/lib/systemd/system/* - /etc/inittab - /etc/rc[0-9].d -@@ -237,7 +238,7 @@ rm -rf $RPM_BUILD_ROOT +@@ -239,7 +239,7 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %ghost %attr(0644,root,root) /etc/sysconfig/kvm %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab @@ -29,5 +21,5 @@ index f2d0271..09674a7 100644 %dir /usr/libexec/initscripts %dir /usr/libexec/initscripts/legacy-actions -- -1.9.1 +2.7.4 diff --git a/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch b/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch index efb277d31..33559d905 100644 --- a/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch +++ b/base/initscripts/centos/meta_patches/spec-include-TiS-changes.patch @@ -1,7 +1,7 @@ -From 9caa7a0860a8adcf38047fb39b6e1577099104d6 Mon Sep 17 00:00:00 2001 +From 29d8980d8c67a302a27a3084f58657414578a2b9 Mon Sep 17 00:00:00 2001 From: Scott Little Date: Mon, 2 Oct 2017 14:49:27 -0400 -Subject: [PATCH 01/13] WRS: spec-include-TiS-changes.patch +Subject: [PATCH] WRS: spec-include-TiS-changes.patch Conflicts: SPECS/initscripts.spec @@ -10,7 +10,7 @@ Conflicts: 1 file changed, 15 insertions(+) diff --git a/SPECS/initscripts.spec b/SPECS/initscripts.spec -index 6b81095..7f93a30 100644 +index e96290a..665b576 100644 --- a/SPECS/initscripts.spec +++ b/SPECS/initscripts.spec @@ -7,6 +7,10 @@ Group: System Environment/Base @@ -24,8 +24,8 @@ index 6b81095..7f93a30 100644 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root Obsoletes: initscripts-legacy <= 9.39 Requires: /bin/awk, sed, coreutils -@@ -35,6 +39,10 @@ Requires(preun): /sbin/chkconfig - BuildRequires: glib2-devel popt-devel gettext pkgconfig +@@ -36,6 +40,10 @@ Requires(preun): /sbin/chkconfig + BuildRequires: glib2-devel popt-devel gettext pkgconfig systemd Provides: /sbin/service +Patch4: support-interface-scriptlets.patch @@ -35,7 +35,7 @@ index 6b81095..7f93a30 100644 %description The initscripts package contains basic system scripts used during a boot of the system. It also contains scripts which -@@ -54,6 +62,10 @@ Currently, this consists of various memory checking code. +@@ -55,6 +63,10 @@ Currently, this consists of various memory checking code. %prep %setup -q @@ -46,7 +46,7 @@ index 6b81095..7f93a30 100644 %build make -@@ -74,6 +86,9 @@ rm -f \ +@@ -75,6 +87,9 @@ rm -f \ touch $RPM_BUILD_ROOT/etc/crypttab chmod 600 $RPM_BUILD_ROOT/etc/crypttab @@ -57,5 +57,5 @@ index 6b81095..7f93a30 100644 /usr/sbin/groupadd -g 22 -r -f utmp -- -1.9.1 +2.7.4 diff --git a/base/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch b/base/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch index 6abdacd33..aff1428da 100644 --- a/base/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch +++ b/base/initscripts/centos/patches/sysconfig-affirmative-check-for-link-carrier.patch @@ -1,4 +1,4 @@ -From 974b70a23b6a6c579fc4d43efd42e42f26c27310 Mon Sep 17 00:00:00 2001 +From cd3e0b0fea9588c987db119cb6d7840ace399368 Mon Sep 17 00:00:00 2001 From: Allain Legacy Date: Thu, 17 Nov 2016 08:27:42 -0500 Subject: [PATCH] sysconfig: affirmative check for link carrier @@ -25,18 +25,18 @@ Signed-off-by: Allain Legacy 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index 798f28a..affa8ba 100644 +index d08f618..13cf4de 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions -@@ -463,7 +463,7 @@ check_link_down () +@@ -473,7 +473,7 @@ check_link_down () delay=20 [ -n "$LINKDELAY" ] && delay=$(($LINKDELAY * 2)) while [ $timeout -le $delay ]; do - [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" != "0" ] && return 1 + [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" == "1" ] && return 1 - usleep 500000 + sleep 0.5 timeout=$((timeout+1)) done -- -1.9.1 +2.7.4 diff --git a/base/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch b/base/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch index 391803810..b7c7aebf2 100644 --- a/base/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch +++ b/base/initscripts/centos/patches/sysconfig-unsafe-usage-of-linkdelay-variable.patch @@ -1,4 +1,4 @@ -From d3d109136f6e01ec1d8291ff89f3e00ff64cab31 Mon Sep 17 00:00:00 2001 +From 9b12287d8dade60c012969db3ae56b36d1e50966 Mon Sep 17 00:00:00 2001 From: Allain Legacy Date: Thu, 17 Nov 2016 11:37:38 -0500 Subject: [PATCH] sysconfig: unsafe usage of linkdelay variable @@ -16,10 +16,10 @@ Signed-off-by: Allain Legacy 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysconfig/network-scripts/network-functions b/sysconfig/network-scripts/network-functions -index affa8ba..a9821f6 100644 +index 13cf4de..4bcc48f 100644 --- a/sysconfig/network-scripts/network-functions +++ b/sysconfig/network-scripts/network-functions -@@ -461,7 +461,7 @@ check_link_down () +@@ -471,7 +471,7 @@ check_link_down () fi timeout=0 delay=20 @@ -27,7 +27,7 @@ index affa8ba..a9821f6 100644 + [[ $LINKDELAY =~ ^[0-9]+$ ]] && delay=$(($LINKDELAY * 2)) while [ $timeout -le $delay ]; do [ "$(cat /sys/class/net/$REALDEVICE/carrier 2>/dev/null)" == "1" ] && return 1 - usleep 500000 + sleep 0.5 -- -1.9.1 +2.7.4 diff --git a/base/initscripts/centos/srpm_path b/base/initscripts/centos/srpm_path index 4559f33fb..1b314d583 100644 --- a/base/initscripts/centos/srpm_path +++ b/base/initscripts/centos/srpm_path @@ -1 +1 @@ -mirror:Source/initscripts-9.49.39-1.el7.src.rpm +mirror:Source/initscripts-9.49.41-1.el7.src.rpm