--- file_not_specified_in_diff +++ file_not_specified_in_diff @@ -5,1 +5,1 @@ -MODULESDIR="${RC_LIBEXECDIR}/net" --- +MODULESDIR="/lib/netifrc/net" @@ -119,1 +119,0 @@ - sleep 1 @@ -125,0 +124,1 @@ + sleep 1 @@ -154,0 +154,3 @@ + case $i in + 0x*) i=$((i)) ;; + esac @@ -636,1 +639,1 @@ - local hidefirstroute=false first=true routes= --- + local hideFirstroute=false first=true routes= @@ -647,1 +650,1 @@ - hidefirstroute=true --- + hideFirstroute=true @@ -653,0 +656,1 @@ + local fam @@ -659,0 +663,6 @@ + + case ${cmd} in + -6" "*) fam="-6"; cmd=${cmd#-6 };; + -4" "*) fam="-4"; cmd=${cmd#-4 };; + esac + @@ -668,0 +678,2 @@ + *:*/128*) cmd="-host ${cmd}";; + *:*/*) cmd="-net ${cmd}";; @@ -670,3 +682,3 @@ - if ${hidefirstroute}; then - _add_route ${cmd} >/dev/null 2>&1 - hidefirstroute=false --- + if ${hideFirstroute}; then + _add_route ${fam} ${cmd} >/dev/null 2>&1 + hideFirstroute=false @@ -674,1 +686,1 @@ - _add_route ${cmd} >/dev/null --- + _add_route ${fam} ${cmd} >/dev/null @@ -703,0 +715,5 @@ + # Don't stop the network at shutdown. + # We don't use the noshutdown keyword so that we are started again + # correctly if we go back to multiuser. + yesno ${keep_network:-YES} && yesno $RC_GOINGDOWN && return 0 +