From: Marcin Krol <hawk@tld-linux.org>
Date: Sun, 22 Jul 2018 23:28:38 +0000 (+0000)
Subject: - fix network init script
X-Git-Url: https://git.tld-linux.org/?p=packages%2Frc-scripts.git;a=commitdiff_plain;h=4d951422a2eea23d45dbdfc3bd04ab472bb528e8

- fix network init script
---

diff --git a/misc_fixes.patch b/misc_fixes.patch
index 66e3a27..2f76edf 100644
--- a/misc_fixes.patch
+++ b/misc_fixes.patch
@@ -1,13 +1,23 @@
-diff --git a/lib/functions b/lib/functions
-index ced6e97..fac4c46 100644
---- a/lib/functions
-+++ b/lib/functions
-@@ -607,7 +607,7 @@ _daemon_set_ulimits() {
+diff -ur rc-scripts-0.5.1.orig/rc.d/init.d/network rc-scripts-0.5.1/rc.d/init.d/network
+--- rc-scripts-0.5.1.orig/rc.d/init.d/network	2018-07-11 21:54:22.000000000 +0000
++++ rc-scripts-0.5.1/rc.d/init.d/network	2018-07-22 23:26:49.256418466 +0000
+@@ -168,7 +168,7 @@
+ 				DEVICE=""; ONBOOT=""; USERS=""; . "$i" 2>/dev/null
+ 				[ "${DEVICE:+set}" != "set" ] && continue
+ 				[ ${USERS:-no} != no ] && continue
+-				is_yes [ ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
++				is_yes ${ONBOOT:-no} && echo "${i##*/ifcfg-}"
+ 			done
+ 		`
  
- # A function to start a program (now it's useful on read-only filesystem too)
- daemon() {
--	local errors="" prog="" end="" waitname="" waittime=""
-+	local errors="" prog="" end="" waitname="" waittime=0
- 	local exit_code=0
- 	local nice=$SERVICE_RUN_NICE_LEVEL
- 	local fork user closefds redirfds pidfile makepid chdir=/
+diff -ur rc-scripts-0.5.1.orig/sysconfig/system rc-scripts-0.5.1/sysconfig/system
+--- rc-scripts-0.5.1.orig/sysconfig/system	2018-07-11 21:54:22.000000000 +0000
++++ rc-scripts-0.5.1/sysconfig/system	2018-07-22 23:26:23.805419983 +0000
+@@ -13,7 +13,6 @@
+ CONSOLE_LOGLEVEL=1
+ 
+ # On errors (when system is starting) run sulogin instead of shell ?
+-# This option disables debuginitrd=sh in geninitrd as well.
+ RUN_SULOGIN_ON_ERR=yes
+ 
+ # Default run nice level for all services if $SERVICE_RUN_NICE_LEVEL is not