From nobody@FreeBSD.org  Mon Mar  9 19:44:32 2009
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 1BB3D1065694
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Mar 2009 19:44:32 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id E38368FC33
	for <freebsd-gnats-submit@FreeBSD.org>; Mon,  9 Mar 2009 19:44:31 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id n29JiVMX068576
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 9 Mar 2009 19:44:31 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id n29JiV5W068575;
	Mon, 9 Mar 2009 19:44:31 GMT
	(envelope-from nobody)
Message-Id: <200903091944.n29JiV5W068575@www.freebsd.org>
Date: Mon, 9 Mar 2009 19:44:31 GMT
From: Sergey Matveychuk <sem@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [rc.subr] [patch] setfib(1) support for rc.subr
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         132483
>Category:       conf
>Synopsis:       rc.subr(8) [patch] setfib(1) support for rc.subr
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    hrs
>State:          patched
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Mon Mar 09 19:50:06 UTC 2009
>Closed-Date:    
>Last-Modified:  Fri Jul 12 10:10:00 UTC 2013
>Originator:     Sergey Matveychuk
>Release:        CURRENT
>Organization:
>Environment:
>Description:
Add support setfib(1) for rc.subr.
If ${name}_fib specified and the number less then configured FIBs number, command will runned with setfib(1).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

--- etc/rc.subr.orig	2009-03-09 21:34:36.000000000 +0300
+++ etc/rc.subr	2009-03-09 22:15:33.000000000 +0300
@@ -58,6 +58,7 @@
 IDCMD="if [ -x $ID ]; then $ID -un; fi"
 PS="/bin/ps -ww"
 JID=`$PS -p $$ -o jid=`
+SETFIB="/usr/sbin/setfib"
 
 case ${OSTYPE} in
 FreeBSD)
@@ -422,6 +423,8 @@
 #	${name}_chdir	n	Directory to cd to before running ${command}
 #				(if not using ${name}_chroot).
 #
+#	${name}_fib	n	A FIB number for setfib(1).
+#
 #	${name}_flags	n	Arguments to call ${command} with.
 #				NOTE:	$flags from the parent environment
 #					can be used to override this.
@@ -581,6 +584,12 @@
 	_pidcmd=
 	_procname=${procname:-${command}}
 
+	eval _fib=\$${name}_fib
+	_setfibcmd=
+	if [ -n "$_fib" -a -x $SETFIB -a $_fib -lt `$SYSCTL_N net.fibs` ]; then
+		_setfibcmd="/usr/sbin/setfib -F $_fib"
+	fi
+
 					# setup pid check command
 	if [ -n "$_procname" ]; then
 		if [ -n "$pidfile" ]; then
@@ -644,7 +653,7 @@
 
 		if [ -n "$_cmd" ]; then
 			_run_rc_precmd || return 1
-			_run_rc_doit "$_cmd $rc_extra_args" || return 1
+			_run_rc_doit "$_setfibcmd $_cmd $rc_extra_args" || return 1
 			_run_rc_postcmd
 			return $_return
 		fi
@@ -683,13 +692,13 @@
 			[ -z "${rc_quiet}" ] && echo "Starting ${name}."
 			if [ -n "$_chroot" ]; then
 				_doit="\
-${_nice:+nice -n $_nice }\
+${_nice:+nice -n $_nice } $_setfibcmd\
 chroot ${_user:+-u $_user }${_group:+-g $_group }${_groups:+-G $_groups }\
 $_chroot $command $rc_flags $command_args"
 			else
 				_doit="\
 ${_chdir:+cd $_chdir && }\
-$command $rc_flags $command_args"
+$_setfibcmd $command $rc_flags $command_args"
 				if [ -n "$_user" ]; then
 				    _doit="su -m $_user -c 'sh -c \"$_doit\"'"
 				fi
--- share/man/man8/rc.subr.8.orig	2009-03-09 22:31:26.000000000 +0300
+++ share/man/man8/rc.subr.8	2009-03-09 22:31:31.000000000 +0300
@@ -587,6 +587,12 @@
 Only supported after
 .Pa /usr
 is mounted.
+.It Va ${name}_fib
+If the number is less than configured FIBs number,
+.Va command
+will be runned with setfib(1). Only supported after
+.Pa /usr
+is mounted.
 .It Va ${name}_flags
 Arguments to call
 .Va command


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-bugs->freebsd-rc 
Responsible-Changed-By: sem 
Responsible-Changed-When: Mon Mar 9 19:53:04 UTC 2009 
Responsible-Changed-Why:  
Over to maintainer 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132483 

From: Sergey Matveychuk <sem@ciam.ru>
To: bug-followup@FreeBSD.org, sem@FreeBSD.org
Cc:  
Subject: Re: conf/132483: [rc.subr] [patch] setfib(1) support for rc.subr
Date: Tue, 10 Mar 2009 23:33:45 +0300

 This is a multi-part message in MIME format.
 --------------070006080300020602030906
 Content-Type: text/plain; charset=UTF-8; format=flowed
 Content-Transfer-Encoding: 7bit
 
 Fixed patch.
 
 --------------070006080300020602030906
 Content-Type: text/plain;
  name="setfib_for_rc.subr.diff.txt"
 Content-Transfer-Encoding: base64
 Content-Disposition: inline;
  filename="setfib_for_rc.subr.diff.txt"
 
 LS0tIGV0Yy9yYy5zdWJyLm9yaWcJMjAwOS0wMy0wOSAyMTozNDozNi4wMDAwMDAwMDAgKzAz
 MDANCisrKyBldGMvcmMuc3VicgkyMDA5LTAzLTA5IDIyOjE1OjMzLjAwMDAwMDAwMCArMDMw
 MA0KQEAgLTU4LDYgKzU4LDcgQEANCiBJRENNRD0iaWYgWyAteCAkSUQgXTsgdGhlbiAkSUQg
 LXVuOyBmaSINCiBQUz0iL2Jpbi9wcyAtd3ciDQogSklEPWAkUFMgLXAgJCQgLW8gamlkPWAN
 CitTRVRGSUI9Ii91c3Ivc2Jpbi9zZXRmaWIiDQogDQogY2FzZSAke09TVFlQRX0gaW4NCiBG
 cmVlQlNEKQ0KQEAgLTQyMiw2ICs0MjMsOCBAQA0KICMJJHtuYW1lfV9jaGRpcgluCURpcmVj
 dG9yeSB0byBjZCB0byBiZWZvcmUgcnVubmluZyAke2NvbW1hbmR9DQogIwkJCQkoaWYgbm90
 IHVzaW5nICR7bmFtZX1fY2hyb290KS4NCiAjDQorIwkke25hbWV9X2ZpYgluCUEgRklCIG51
 bWJlciBmb3Igc2V0ZmliKDEpLg0KKyMNCiAjCSR7bmFtZX1fZmxhZ3MJbglBcmd1bWVudHMg
 dG8gY2FsbCAke2NvbW1hbmR9IHdpdGguDQogIwkJCQlOT1RFOgkkZmxhZ3MgZnJvbSB0aGUg
 cGFyZW50IGVudmlyb25tZW50DQogIwkJCQkJY2FuIGJlIHVzZWQgdG8gb3ZlcnJpZGUgdGhp
 cy4NCkBAIC01ODEsNiArNTg0LDEyIEBADQogCV9waWRjbWQ9DQogCV9wcm9jbmFtZT0ke3By
 b2NuYW1lOi0ke2NvbW1hbmR9fQ0KIA0KKwlldmFsIF9maWI9XCQke25hbWV9X2ZpYg0KKwlf
 c2V0ZmliY21kPQ0KKwlpZiBbIC1uICIkX2ZpYiIgLWEgLXggJFNFVEZJQiAtYSAke19maWI6
 LTB9IC1sdCBgJFNZU0NUTF9OIG5ldC5maWJzYCBdOyB0aGVuDQorCQlfc2V0ZmliY21kPSIv
 dXNyL3NiaW4vc2V0ZmliIC1GICRfZmliIg0KKwlmaQ0KKw0KIAkJCQkJIyBzZXR1cCBwaWQg
 Y2hlY2sgY29tbWFuZA0KIAlpZiBbIC1uICIkX3Byb2NuYW1lIiBdOyB0aGVuDQogCQlpZiBb
 IC1uICIkcGlkZmlsZSIgXTsgdGhlbg0KQEAgLTY0NCw3ICs2NTMsNyBAQA0KIA0KIAkJaWYg
 WyAtbiAiJF9jbWQiIF07IHRoZW4NCiAJCQlfcnVuX3JjX3ByZWNtZCB8fCByZXR1cm4gMQ0K
 LQkJCV9ydW5fcmNfZG9pdCAiJF9jbWQgJHJjX2V4dHJhX2FyZ3MiIHx8IHJldHVybiAxDQor
 CQkJX3J1bl9yY19kb2l0ICIkX3NldGZpYmNtZCAkX2NtZCAkcmNfZXh0cmFfYXJncyIgfHwg
 cmV0dXJuIDENCiAJCQlfcnVuX3JjX3Bvc3RjbWQNCiAJCQlyZXR1cm4gJF9yZXR1cm4NCiAJ
 CWZpDQpAQCAtNjgzLDEzICs2OTIsMTMgQEANCiAJCQlbIC16ICIke3JjX3F1aWV0fSIgXSAm
 JiBlY2hvICJTdGFydGluZyAke25hbWV9LiINCiAJCQlpZiBbIC1uICIkX2Nocm9vdCIgXTsg
 dGhlbg0KIAkJCQlfZG9pdD0iXA0KLSR7X25pY2U6K25pY2UgLW4gJF9uaWNlIH1cDQorJHtf
 bmljZTorbmljZSAtbiAkX25pY2UgfSAkX3NldGZpYmNtZFwNCiBjaHJvb3QgJHtfdXNlcjor
 LXUgJF91c2VyIH0ke19ncm91cDorLWcgJF9ncm91cCB9JHtfZ3JvdXBzOistRyAkX2dyb3Vw
 cyB9XA0KICRfY2hyb290ICRjb21tYW5kICRyY19mbGFncyAkY29tbWFuZF9hcmdzIg0KIAkJ
 CWVsc2UNCiAJCQkJX2RvaXQ9IlwNCiAke19jaGRpcjorY2QgJF9jaGRpciAmJiB9XA0KLSRj
 b21tYW5kICRyY19mbGFncyAkY29tbWFuZF9hcmdzIg0KKyRfc2V0ZmliY21kICRjb21tYW5k
 ICRyY19mbGFncyAkY29tbWFuZF9hcmdzIg0KIAkJCQlpZiBbIC1uICIkX3VzZXIiIF07IHRo
 ZW4NCiAJCQkJICAgIF9kb2l0PSJzdSAtbSAkX3VzZXIgLWMgJ3NoIC1jIFwiJF9kb2l0XCIn
 Ig0KIAkJCQlmaQ0KLS0tIHNoYXJlL21hbi9tYW44L3JjLnN1YnIuOC5vcmlnCTIwMDktMDMt
 MDkgMjI6MzE6MjYuMDAwMDAwMDAwICswMzAwDQorKysgc2hhcmUvbWFuL21hbjgvcmMuc3Vi
 ci44CTIwMDktMDMtMDkgMjI6MzE6MzEuMDAwMDAwMDAwICswMzAwDQpAQCAtNTg3LDYgKzU4
 NywxMiBAQA0KIE9ubHkgc3VwcG9ydGVkIGFmdGVyDQogLlBhIC91c3INCiBpcyBtb3VudGVk
 Lg0KKy5JdCBWYSAke25hbWV9X2ZpYg0KK0lmIHRoZSBudW1iZXIgaXMgbGVzcyB0aGFuIGNv
 bmZpZ3VyZWQgRklCcyBudW1iZXIsDQorLlZhIGNvbW1hbmQNCit3aWxsIGJlIHJ1bm5lZCB3
 aXRoIHNldGZpYigxKS4gT25seSBzdXBwb3J0ZWQgYWZ0ZXINCisuUGEgL3Vzcg0KK2lzIG1v
 dW50ZWQuDQogLkl0IFZhICR7bmFtZX1fZmxhZ3MNCiBBcmd1bWVudHMgdG8gY2FsbA0KIC5W
 YSBjb21tYW5kDQo=
 --------------070006080300020602030906--

From: Eugene Grosbein <eugen@grosbein.pp.ru>
To: bug-followup@freebsd.org
Cc: sem@freebsd.org
Subject: Re: conf/132483: rc.subr(8) [patch] setfib(1) support for rc.subr
Date: Sat, 08 May 2010 00:08:20 +0700

 I've tested second patch (setfib_for_rc.subr.diff), it works.
 
 Vote for commit. Without this, there is no way to bind
 a network service running from rcNG-based startup script
 to a non-default FIB.
 
 The only alternative is ugly way to use /etc/rc.local with
 "setfib N ... forcestart" command that ignores dependencies.
 
 Please commit.
 
 Eugene Grosbein
 

From: Jakob van Santen <jvansanten@gmail.com>
To: bug-followup@FreeBSD.org,
 sem@FreeBSD.org
Cc:  
Subject: Re: conf/132483: rc.subr(8) [patch] setfib(1) support for rc.subr
Date: Sun, 12 Dec 2010 17:47:46 -0600

 To underscore the point already made: I've tested this patch on my MIPS =
 board running 9-CURRENT, and it works well. I hope this can be merged in =
 to trunk as it is quite useful.
 
 Cheers,
 Jakob=

From: "Oleksandr V. Typlyns'kyi" <astral@wangsamp.km.ua>
To: bug-followup@FreeBSD.org, sem@FreeBSD.org, hrs@FreeBSD.org
Cc:  
Subject: Re: conf/132483: rc.subr(8) [patch] setfib(1) support for rc.subr
Date: Sat, 11 Aug 2012 21:12:08 +0300 (EEST)

 uname -srm
 FreeBSD 9.1-PRERELEASE amd64
 
 /etc/rc.d/routing already use setfib in static_inet6()
 Seems like it's time to implement support for setfib in rc.subr and full 
 multiple fib support in /etc/rc.d/routing (conf/132476).
 -- 
 WNGS-RIPE
State-Changed-From-To: open->patched 
State-Changed-By: crees 
State-Changed-When: Sat Nov 10 17:54:05 UTC 2012 
State-Changed-Why:  
Committed to head in r242184 


Responsible-Changed-From-To: freebsd-rc->hrs 
Responsible-Changed-By: crees 
Responsible-Changed-When: Sat Nov 10 17:54:05 UTC 2012 
Responsible-Changed-Why:  
Committed by you 

http://www.freebsd.org/cgi/query-pr.cgi?pr=132483 

From: "Oleksandr V. Typlyns'kyi" <astral@wangsamp.km.ua>
To: bug-followup@FreeBSD.org, sem@FreeBSD.org, hrs@FreeBSD.org, 
    eugen@grosbein.net
Cc:  
Subject: Re: conf/132483: rc.subr(8) [patch] setfib(1) support for rc.subr
Date: Fri, 12 Jul 2013 13:03:34 +0300 (EEST)

 Thanks for MFC it in 9-STABLE.
 http://svnweb.freebsd.org/changeset/base/253233
 Four-years-long way :)
 How about 8-STABLE too?
>Unformatted:
