swift 05/06/14 10:16:47
Modified: xml/htdocs/doc/en/handbook hb-net-advanced.xml
hb-net-functions.xml hb-net-modules.xml
Log:
Use two spaces instead of a tab
Revision Changes Path
1.7 +12 -12 xml/htdocs/doc/en/handbook/hb-net-advanced.xml
file :
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-advanced.xml?rev=1.7&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain:
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-advanced.xml?rev=1.7&content-type=text/plain&cvsroot=gentoo
diff :
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-advanced.xml.diff?r1=1.6&r2=1.7&cvsroot=gentoo
Index: hb-net-advanced.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-net-advanced.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- hb-net-advanced.xml 14 Jun 2005 09:52:01 -0000 1.6
+++ hb-net-advanced.xml 14 Jun 2005 10:16:47 -0000 1.7
@@ -4,7 +4,7 @@
<!-- The content of this document is licensed under the CC-BY-SA license -->
<!-- See http://creativecommons.org/licenses/by-sa/2.5 -->
-<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-net-advanced.xml,v 1.6
2005/06/14 09:52:01 swift Exp $ -->
+<!-- $Header:
/var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-net-advanced.xml,v 1.7
2005/06/14 10:16:47 swift Exp $ -->
<sections>
@@ -70,28 +70,28 @@
<pre caption="Configuration examples">
<comment># Adding three IPv4 addresses</comment>
config_eth0=(
- "192.168.0.2/24"
- "192.168.0.3/24"
- "192.168.0.4/24"
+ "192.168.0.2/24"
+ "192.168.0.3/24"
+ "192.168.0.4/24"
)
<comment># Adding an IPv4 address and two IPv6 addresses</comment>
config_eth0=(
- "192.168.0.2/24"
- "4321:0:1:2:3:4:567:89ab"
- "4321:0:1:2:3:4:567:89ac"
+ "192.168.0.2/24"
+ "4321:0:1:2:3:4:567:89ab"
+ "4321:0:1:2:3:4:567:89ac"
)
<comment># Keep our kernel assigned address, unless the interface goes
# down so assign another via DHCP. If DHCP fails then add a
# static address determined by APIPA</comment>
config_eth0=(
- "noop"
- "dhcp"
+ "noop"
+ "dhcp"
)
fallback_eth0=(
- "null"
- "apipa"
+ "null"
+ "apipa"
)
</pre>
@@ -175,7 +175,7 @@
<pre caption="net.br0 dependency in /etc/conf.d/net">
<comment># You can use any dependency (use, after, before) as found in current
scripts</comment>
depend_br0() {
- need net.eth0 net.eth1
+ need net.eth0 net.eth1
}
</pre>
1.4 +56 -56 xml/htdocs/doc/en/handbook/hb-net-functions.xml
file :
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-functions.xml?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain:
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-functions.xml?rev=1.4&content-type=text/plain&cvsroot=gentoo
diff :
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-functions.xml.diff?r1=1.3&r2=1.4&cvsroot=gentoo
Index: hb-net-functions.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-net-functions.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hb-net-functions.xml 14 Jun 2005 09:56:52 -0000 1.3
+++ hb-net-functions.xml 14 Jun 2005 10:16:47 -0000 1.4
@@ -40,51 +40,51 @@
<pre caption="pre/post up/down function examples">
preup() {
- <comment># Test for link on the interface prior to bringing it up. This
- # only works on some network adapters and requires the mii-diag
- # package to be installed.</comment>
- if mii-tool ${IFACE} 2> /dev/null | grep -q 'no link'; then
- ewarn "No link on ${IFACE}, aborting configuration"
- return 1
- fi
-
- <comment># Test for link on the interface prior to bringing it up. This
- # only works on some network adapters and requires the ethtool
- # package to be installed.</comment>
- if ethtool ${IFACE} | grep -q 'Link detected: no'; then
- ewarn "No link on ${IFACE}, aborting configuration"
- return 1
- fi
+ <comment># Test for link on the interface prior to bringing it up. This
+ # only works on some network adapters and requires the mii-diag
+ # package to be installed.</comment>
+ if mii-tool ${IFACE} 2> /dev/null | grep -q 'no link'; then
+ ewarn "No link on ${IFACE}, aborting configuration"
+ return 1
+ fi
+
+ <comment># Test for link on the interface prior to bringing it up. This
+ # only works on some network adapters and requires the ethtool
+ # package to be installed.</comment>
+ if ethtool ${IFACE} | grep -q 'Link detected: no'; then
+ ewarn "No link on ${IFACE}, aborting configuration"
+ return 1
+ fi
- <comment># Remember to return 0 on success</comment>
- return 0
+ <comment># Remember to return 0 on success</comment>
+ return 0
}
predown() {
- <comment># The default in the script is to test for NFS root and
disallow
- # downing interfaces in that case. Note that if you specify a
- # predown() function you will override that logic. Here it is, in
- # case you still want it...</comment>
- if is_net_fs /; then
- eerror "root filesystem is network mounted -- can't stop
${IFACE}"
- return 1
- fi
+ <comment># The default in the script is to test for NFS root and disallow
+ # downing interfaces in that case. Note that if you specify a
+ # predown() function you will override that logic. Here it is, in
+ # case you still want it...</comment>
+ if is_net_fs /; then
+ eerror "root filesystem is network mounted -- can't stop ${IFACE}"
+ return 1
+ fi
- <comment># Remember to return 0 on success</comment>
- return 0
+ <comment># Remember to return 0 on success</comment>
+ return 0
}
postup() {
- <comment># This function could be used, for example, to register with a
- # dynamic DNS service. Another possibility would be to
- # send/receive mail once the interface is brought up.</comment>
+ <comment># This function could be used, for example, to register with a
+ # dynamic DNS service. Another possibility would be to
+ # send/receive mail once the interface is brought up.</comment>
return 0
}
postdown() {
- <comment># This function is mostly here for completeness... I haven't
- # thought of anything nifty to do with it yet ;-)</comment>
- return 0
+ <comment># This function is mostly here for completeness... I haven't
+ # thought of anything nifty to do with it yet ;-)</comment>
+ return 0
}
</pre>
@@ -124,34 +124,34 @@
<pre caption="pre/post association functions">
preassociate() {
- <comment># The below adds two configuration variables leap_user_ESSID
- # and leap_pass_ESSID. When they are both configured for the ESSID
- # being connected to then we run the CISCO LEAP script</comment>
-
- local user pass
- eval user=\"\$\{leap_user_${ESSIDVAR}\}\"
- eval pass=\"\$\{leap_pass_${ESSIDVAR}\}\"
-
- if [[ -n ${user} && -n ${pass} ]]; then
- if [[ ! -x /opt/cisco/bin/leapscript ]]; then
- eend "For LEAP support, please emerge
net-misc/cisco-aironet-client-utils"
- return 1
- fi
- einfo "Waiting for LEAP Authentication on \"${ESSID//\\\\//}\""
- if /opt/cisco/bin/leapscript ${user} ${pass} | grep -q 'Login
incorrect'; then
- ewarn "Login Failed for ${user}"
- return 1
- fi
- fi
+ <comment># The below adds two configuration variables leap_user_ESSID
+ # and leap_pass_ESSID. When they are both configured for the ESSID
+ # being connected to then we run the CISCO LEAP script</comment>
+
+ local user pass
+ eval user=\"\$\{leap_user_${ESSIDVAR}\}\"
+ eval pass=\"\$\{leap_pass_${ESSIDVAR}\}\"
+
+ if [[ -n ${user} && -n ${pass} ]]; then
+ if [[ ! -x /opt/cisco/bin/leapscript ]]; then
+ eend "For LEAP support, please emerge
net-misc/cisco-aironet-client-utils"
+ return 1
+ fi
+ einfo "Waiting for LEAP Authentication on \"${ESSID//\\\\//}\""
+ if /opt/cisco/bin/leapscript ${user} ${pass} | grep -q 'Login incorrect';
then
+ ewarn "Login Failed for ${user}"
+ return 1
+ fi
+ fi
- return 0
+ return 0
}
postassociate() {
- <comment># This function is mostly here for completeness... I haven't
- # thought of anything nifty to do with it yet ;-)</comment>
+ <comment># This function is mostly here for completeness... I haven't
+ # thought of anything nifty to do with it yet ;-)</comment>
- return 0
+ return 0
}
</pre>
1.4 +3 -3 xml/htdocs/doc/en/handbook/hb-net-modules.xml
file :
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-modules.xml?rev=1.4&content-type=text/x-cvsweb-markup&cvsroot=gentoo
plain:
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-modules.xml?rev=1.4&content-type=text/plain&cvsroot=gentoo
diff :
http://www.gentoo.org/cgi-bin/viewcvs.cgi/xml/htdocs/doc/en/handbook/hb-net-modules.xml.diff?r1=1.3&r2=1.4&cvsroot=gentoo
Index: hb-net-modules.xml
===================================================================
RCS file: /var/cvsroot/gentoo/xml/htdocs/doc/en/handbook/hb-net-modules.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- hb-net-modules.xml 14 Jun 2005 10:07:18 -0000 1.3
+++ hb-net-modules.xml 14 Jun 2005 10:16:47 -0000 1.4
@@ -227,7 +227,7 @@
<pre caption="sample /etc/ppp/pap-secrets">
<comment># The * is important</comment>
-"username" * "password"
+"username" * "password"
</pre>
</body>
@@ -285,7 +285,7 @@
<comment># Depend on eth0, eth1 and eth2 as they may require extra
configuration</comment>
depend_bond0() {
- need net.eth0 net.eth1 net.eth2
+ need net.eth0 net.eth1 net.eth2
}
</pre>
@@ -322,7 +322,7 @@
<comment># Depend on eth0 and eth1 as they may require extra
configuration</comment>
depend_br0() {
- need net.eth0 net.eth1
+ need net.eth0 net.eth1
}
</pre>
--
[email protected] mailing list
