[patch] Enabled maxfail and persist options

pppd.patch (text/plain), 1.01 KB, created by Roy Marples (RETIRED) on 2006-02-06 03:16:29 UTC

--- /lib/rcscripts/net.modules.d/pppd	(revision 1851)
+++ net-scripts/net.modules.d/pppd	(working copy)
@@ -146,9 +146,9 @@
 	opts="${!opts}"
 
 	# We don't work with these options set by the user
-	for i in unit nodetach linkname maxfail persist ; do
-		if [[ " ${opts} " == *" ${i} "* ]]; then
-			eerror "The option \"${i}\" is not allowed"
+	for i in unit nodetach linkname ; do
+		if [[ " ${opts} " == *" ${i} "* ]] ; then
+			eerror "The option \"${i}\" is not allowed in pppd_${ifvar}"
 			return 1
 		fi
 	done
@@ -172,9 +172,15 @@
 	[[ -f "/etc/ppp/options.${iface}" ]] \
 		&& opts="${opts} file /etc/ppp/options.${iface}"
 
-	# Set forced options
-	opts="unit ${unit} persist maxfail 0 ${opts}"
+	# Set unit
+	opts="unit ${unit} ${opts}"
 
+	# Default maxfail to 0 unless specified
+	[[ " ${opts} " != *" maxfail "* ]] && opts="${opts} maxfail 0"
+
+	# Append persist
+	[[ " ${opts} " != *" persist "* ]] && opts="${opts} persist"
+	
 	# Setup connect script
 	local chat="chat_${ifvar}[@]"
 	if [[ -n "${!chat}" ]]; then