[gentoo-commits] proj/openrc:master commit in: conf.d/

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     c020454c846c3831e2299cf30c4d87286d4655da
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 05:34:50 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 05:34:50 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=c020454c

update documentation for windowkeys variable

The documentation makes a recommendation for the setting but does not
state the purpose of the variable.

X-Gentoo-Bug: 357869
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=357869

---
 conf.d/keymaps |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/conf.d/keymaps b/conf.d/keymaps
index 842803b..7707272 100644
--- a/conf.d/keymaps
+++ b/conf.d/keymaps
@@ -4,6 +4,8 @@ keymap="us"
 
 # Should we first load the 'windowkeys' console keymap?  Most x86 users will
 # say "yes" here.  Note that non-x86 users should leave it as "no".
+# Loading this keymap will enable VT switching (like ALT+Left/Right)
+# using the special windows keys on the linux console.
 windowkeys="NO"
 
 # The maps to load for extended keyboards.  Most users will leave this as is.

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     74c8667497425746b3d2eaaf88cae1ac2bdf34f5
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Tue May 17 18:06:55 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue May 17 18:06:55 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=74c86674

fix keymaps config file to show the correct variable name

X-Gentoo-Bug: 367283
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=367283

---
 conf.d/keymaps |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf.d/keymaps b/conf.d/keymaps
index 7707272..1a5b944 100644
--- a/conf.d/keymaps
+++ b/conf.d/keymaps
@@ -1,4 +1,4 @@
-# Use KEYMAP to specify the default console keymap.  There is a complete tree
+# Use keymap to specify the default console keymap.  There is a complete tree
 # of keymaps in /usr/share/keymaps to choose from.
 keymap="us"
 

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     d4bdd328970e4c82d699d8b95a6fa3854627627b
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 19 23:39:12 2011 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Jun 19 23:39:12 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=d4bdd328

fix comment in conf.d/consolefont

X-Gentoo-Bug: 368277
X-Gentoo-Bug-URL: http://bugs.gentoo.org/show_bug.cgi?id=368277

---
 conf.d/consolefont |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf.d/consolefont b/conf.d/consolefont
index c7fe898..b2fa635 100644
--- a/conf.d/consolefont
+++ b/conf.d/consolefont
@@ -3,7 +3,7 @@
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
 # This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
-# not want to use it, run "rc-update del consolefont" as root).
+# not want to use it, run "rc-update del consolefont boot" as root).
 consolefont="default8x16"
 
 # consoletranslation is the charset map file to use.  Leave commented to use

[gentoo-commits] proj/openrc:master commit in: conf.d/

[Robin H. Johnson]

commit:     3ad849c5d6a24ef66152004eb3149d2cff973b1c
Author:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sat Oct  8 18:52:05 2011 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sat Oct  8 18:53:13 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=3ad849c5

Bug #385971: fix net.example reference

Add in wildcards for reference to net.example, so that users can find it
regardless of version and dodoc compression settings.

X-Gentoo-Bug: 385971
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=385971
Reported-By: Serkan Kaba <serkan <AT> gentoo.org>
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

---
 conf.d/net |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf.d/net b/conf.d/net
index 3a08aa4..52a03e3 100644
--- a/conf.d/net
+++ b/conf.d/net
@@ -1,4 +1,4 @@
 # This blank configuration will automatically use DHCP for any net.*
 # scripts in /etc/init.d.  To create a more complete configuration,
-# please review /usr/share/doc/openrc/net.example and save your configuration
+# please review /usr/share/doc/openrc*/net.example* and save your configuration
 # in /etc/conf.d/net (this file :]!).

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     0fa164dff25969dd56a868446e0644396b2587dc
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 29 15:37:23 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Fri Mar  2 17:00:25 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=0fa164df

Clarify the meaning of the clock_hctosys variable

Reported-by: Ian Abbott <ian <AT> abbott.org>
X-Gentoo-Bug: 405861
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=405861

---
 conf.d/hwclock |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/conf.d/hwclock b/conf.d/hwclock
index 230d81d..59bb732 100644
--- a/conf.d/hwclock
+++ b/conf.d/hwclock
@@ -4,9 +4,11 @@
 # you should set it to "local".
 clock="UTC"
 
-# If you want to set the system time to the current hardware clock
-# during bootup, then say "YES" here. You do not need this if you are
-# running a modern kernel with CONFIG_RTC_HCTOSYS set to y.
+# If you want the hwclock script to set the system time (software clock)
+# to match the current hardware clock during bootup, leave this
+# commented out.
+# However, you can set this to "NO" ifyou are running a modern kernel
+# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
 #clock_hctosys="YES"
 
 # If you do not want to set the hardware clock to the current system

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     de36b26d5e8e331d91a3f2db04174d7d203210a1
Author:     William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Thu Jun  7 15:51:02 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jun  7 15:51:02 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=de36b26d

fix consolefont documentation to reflect the default state

conf.d/consolefont was written as though the consolefont service was
active by default. It is not, so this has been fixed.

reported-by: Ikonta <AT> yandex.ru
X-Gentoo-Bug: 420037
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=420037

---
 conf.d/consolefont |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf.d/consolefont b/conf.d/consolefont
index b2fa635..e01ae84 100644
--- a/conf.d/consolefont
+++ b/conf.d/consolefont
@@ -1,9 +1,10 @@
+# The consolefont service is not activated by default. If you need to
+# use it, you should run "rc-update add consolefont boot" as root.
+#
 # consolefont specifies the default font that you'd like Linux to use on the
 # console.  You can find a good selection of fonts in /usr/share/consolefonts;
 # you shouldn't specify the trailing ".psf.gz", just the font name below.
 # To use the default console font, comment out the CONSOLEFONT setting below.
-# This setting is used by the /etc/init.d/consolefont script (NOTE: if you do
-# not want to use it, run "rc-update del consolefont boot" as root).
 consolefont="default8x16"
 
 # consoletranslation is the charset map file to use.  Leave commented to use

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     84ad14b2e4e4c97c334def409a53c612bca70eb3
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jul  9 14:25:24 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul  9 14:25:24 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=84ad14b2

fix reference to dmesg man page

Correct the reference in conf.d/dmesg from dmesg(8) to dmesg(1).

reported-by: <toralf.foerster <AT> gmx.de>
X-Gentoo-Bug: 425370
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=425370

---
 conf.d/dmesg |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/conf.d/dmesg b/conf.d/dmesg
index eb065f2..cd4b8b3 100644
--- a/conf.d/dmesg
+++ b/conf.d/dmesg
@@ -1,3 +1,3 @@
 # Sets the level at which logging of messages is done to the
-# console.  See dmesg(8) for more info.
+# console.  See dmesg(1) for more info.
 dmesg_level="1"

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     8661af3223d4115284fcebdf430017d19581d611
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov 29 18:34:34 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 18:34:34 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=8661af32

netmount: make "net" the default network option for now

Currently, we have the net virtual, so we should use it as the default
in this instance so that netmount comes up after it thinks the network
is up. However, this is technically eroneous, because there is no way to
know from the init system that we really have network connectivity.

Reported-by: cheepeero <AT> gmx.net
X-Gentoo-Bug: 445116
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=445116

---
 conf.d/netmount |   46 +++++++++++++++++++++++++++++++++-------------
 1 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/conf.d/netmount b/conf.d/netmount
index 7df2c8d..fc19fd4 100644
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -1,20 +1,40 @@
-# Depending on how mounting your network file systems behaves when your
-# network interfaces are down, you may need to set the netmount script to
-# require  specific network interfaces to be active. This file gives
-# examples of how to do this:
+# You will need to set the dependencies in the netmount script to match
+# the network configuration tools you are using. This should be done in
+# this file by following the examples below, and not by changing the
+# service script itself.
 #
-# If you are using newnet and configuring the interface with a static
-# address with the network script:
-# rc_need="network"
+# Each of these examples is meant to be used separately. So, for
+# example, do not set rc_need to something like "net.eth0 dhcpcd".
+#
+# If you are using newnet and configuring your interfaces with static
+# addresses with the network script, you  should use this setting.
+#
+#rc_need="network"
 #
 # If you are using oldnet, you must list the specific net.* services you
-# need:
+# need.
+#
+# This example assumes all of your netmounts can be reached on
+# eth0.
+#
+#rc_need="net.eth0"
 #
-# rc_need="net.eth0"
-# rc_need="net.eth1 net.eth2"
+# This example assumes some of your netmounts are on eth1 and some
+# are on eth2.
+#
+#rc_need="net.eth1 net.eth2"
 #
 # If you are using a dynamic network management tool like
-# networkmanager, dhcpcd, etc, you should list that tool here.
+# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
+# manage the network interfaces with the routes to your netmounts, you
+# should list that tool.
+#
+#rc_need="networkmanager"
+#rc_need="dhcpcd"
+#rc_need="wicd"
+#
+# The default setting is designed to be backward compatible with our
+# current setup, but you are highly discouraged from using this. In
+# other words, please change it to be more suited to your system.
 #
-# rc_need="networkmanager"
-# rc_need="dhcpcd"
+rc_need="net"

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     257e10a1abe275cfdd01f590e78a499c292ab55f
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Jan  9 19:56:31 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Jan  9 19:56:31 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=257e10a1

conf.d/keymaps: Remove the currency and euro symbols

A comment in this file had the actual currency and euro symbols, which
were not utf-8, so I was requested to remove them.

X-Gentoo-Bug: 494936
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=494936

---
 conf.d/keymaps | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.d/keymaps b/conf.d/keymaps
index f2431de..1ba568a 100644
--- a/conf.d/keymaps
+++ b/conf.d/keymaps
@@ -18,6 +18,6 @@ extended_keymaps=""
 # For a list of valid sets, run `dumpkeys --help`
 dumpkeys_charset=""
 
-# Some fonts map AltGr-E to the currency symbol ¤ instead of the Euro €
+# Some fonts map AltGr-E to the currency symbol instead of the Euro.
 # To fix this, set to "yes"
 fix_euro="NO"

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     7fb209a6fc3512d3437bbb175853f1f01393b74d
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Mar 13 20:27:40 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Mar 13 20:27:40 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=7fb209a6

conf.d/hwclock: typo fix

---
 conf.d/hwclock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.d/hwclock b/conf.d/hwclock
index 59bb732..fc65ac2 100644
--- a/conf.d/hwclock
+++ b/conf.d/hwclock
@@ -7,7 +7,7 @@ clock="UTC"
 # If you want the hwclock script to set the system time (software clock)
 # to match the current hardware clock during bootup, leave this
 # commented out.
-# However, you can set this to "NO" ifyou are running a modern kernel
+# However, you can set this to "NO" if you are running a modern kernel
 # with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
 #clock_hctosys="YES"
 

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     faaaab4bf540b4df011abea5985963dbc9e1646a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Aug 10 18:00:39 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 18:00:39 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=faaaab4b

hwclock: fix comments about the usage of clock_hctosys

The clock_hctosys variable should be set to YES if you are not using NTP to
synchronize your system time; it doesn't have anything to do with the
kernel configuration.

---
 conf.d/hwclock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.d/hwclock b/conf.d/hwclock
index fc65ac2..ce9b40a 100644
--- a/conf.d/hwclock
+++ b/conf.d/hwclock
@@ -8,7 +8,7 @@ clock="UTC"
 # to match the current hardware clock during bootup, leave this
 # commented out.
 # However, you can set this to "NO" if you are running a modern kernel
-# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
+# and using NTP to synchronize your system clock.
 #clock_hctosys="YES"
 
 # If you do not want to set the hardware clock to the current system

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     faaaab4bf540b4df011abea5985963dbc9e1646a
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Sun Aug 10 18:00:39 2014 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Sun Aug 10 18:00:39 2014 +0000
URL:        http://sources.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=faaaab4b

hwclock: fix comments about the usage of clock_hctosys

The clock_hctosys variable should be set to YES if you are not using NTP to
synchronize your system time; it doesn't have anything to do with the
kernel configuration.

---
 conf.d/hwclock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.d/hwclock b/conf.d/hwclock
index fc65ac2..ce9b40a 100644
--- a/conf.d/hwclock
+++ b/conf.d/hwclock
@@ -8,7 +8,7 @@ clock="UTC"
 # to match the current hardware clock during bootup, leave this
 # commented out.
 # However, you can set this to "NO" if you are running a modern kernel
-# with CONFIG_RTC_HCTOSYS set to y and your hardware clock set to UTC.
+# and using NTP to synchronize your system clock.
 #clock_hctosys="YES"
 
 # If you do not want to set the hardware clock to the current system

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     ddb895b355e02c9c07b00bfaf00d1bf8a7abbc03
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Wed Nov 11 21:48:19 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Wed Nov 11 21:48:19 2015 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=ddb895b3

conf.d/netmount: typo fix

X-Gentoo-Bug: 564846
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=564846

 conf.d/netmount | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf.d/netmount b/conf.d/netmount
index fc19fd4..53717fc 100644
--- a/conf.d/netmount
+++ b/conf.d/netmount
@@ -25,11 +25,11 @@
 #rc_need="net.eth1 net.eth2"
 #
 # If you are using a dynamic network management tool like
-# networkmanager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
+# NetworkManager, dhcpcd in standalone mode, wicd, badvpn-ncd, etc, to
 # manage the network interfaces with the routes to your netmounts, you
 # should list that tool.
 #
-#rc_need="networkmanager"
+#rc_need="NetworkManager"
 #rc_need="dhcpcd"
 #rc_need="wicd"
 #

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     1cb7eec31f37db0de11a4b39939fd3fbe17c1e24
Author:     Gokturk Yuksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Thu Dec 10 01:10:57 2015 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 22:22:34 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=1cb7eec3

conf.d/bootmisc: typo fix: s/dmesc/dmesg/

This fixes #72.

 conf.d/bootmisc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.d/bootmisc b/conf.d/bootmisc
index 5371209..dd5b08e 100644
--- a/conf.d/bootmisc
+++ b/conf.d/bootmisc
@@ -9,7 +9,7 @@ wipe_tmp="YES"
 # This may be useful if you need the kernel boot log afterwards
 log_dmesg="YES"
 
-# Save the previous dmesg log to dmesc.old
+# Save the previous dmesg log to dmesg.old
 # This may be useful if you need to compare the current boot to the
 # previous one.
 #previous_dmesg=no

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     a3133fec250eca3cdfb460c2ce26c707fd593c09
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Mon Jul 18 22:59:57 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 16:46:04 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a3133fec

conf.d: make network file static

 conf.d/.gitignore |  1 -
 conf.d/Makefile   |  7 ++---
 conf.d/network    | 80 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 82 insertions(+), 6 deletions(-)

diff --git a/conf.d/.gitignore b/conf.d/.gitignore
index 377ebc0..a228e5d 100644
--- a/conf.d/.gitignore
+++ b/conf.d/.gitignore
@@ -1,2 +1 @@
-network
 staticroute

diff --git a/conf.d/Makefile b/conf.d/Makefile
index fb54fc5..25dff8e 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -6,8 +6,8 @@ CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
 
 ifeq (${MKNET},yes)
 CONF+= network staticroute
-TARGETS+=	network staticroute
-CLEANFILES+=	network staticroute
+TARGETS+=	staticroute
+CLEANFILES+=	staticroute
 endif
 
 MK=	../mk
@@ -22,8 +22,5 @@ CONF-NetBSD=	moused rarpd savecore
 
 include ${MK}/scripts.mk
 
-network: network.in network${SFX}
-	cat $^ > $@
-
 staticroute: staticroute${SFX}
 	cp $@${SFX} $@

diff --git a/conf.d/network b/conf.d/network
new file mode 100644
index 0000000..923e926
--- /dev/null
+++ b/conf.d/network
@@ -0,0 +1,80 @@
+# Assign static IP addresses and run custom scripts per interface.
+# Seperate commands with ;
+# Prefix with ! to run a shell script.
+# Use \$int to represent the interface
+#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
+
+# You also have ifup_eth0 and ifdown_eth0 to run other commands when
+# eth0 is started and stopped.
+# You should note that we don't stop the network at system shutdown by default.
+# If you really need this, then set keep_network=NO
+
+# Lastly, the interfaces variable pulls in virtual interfaces that cannot
+# be automatically detected.
+#interfaces="br0 bond0 vlan0"
+
+# You can also use files instead of variables here if you like:
+# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
+# /etc/ip.eth0 is equivalent to ifconfig_eth0
+# /etc/ifup.eth0 is equivalent to ifup_eth0
+# /etc/ifdown.eth0 is equivalent to ifdown_eth0
+# Any files found will automatically be put into the interfaces variable.
+# You don't need to escape variables in files, so use $int instead of \$int.
+
+# If you require DHCP, you should install dhcpcd and add it to the boot or
+# default runlevel.
+
+# NIS users can set the domain name here
+#domainname="foobar"
+
+# You can add a default route.
+# The way this is done is slightly different depending on the operating system.
+#
+# *BSD:
+#defaultroute="192.168.0.1"
+#defaultroute6="2001:a:b:c"
+#Hurd/Linux (ifconfig):
+#defaultroute="gw 192.168.0.1"
+#defaultroute6="gw 2001:a:b:c"
+
+# The remainder of this file applies to Linux only and shows how
+# iproute2 is supported along with other examples.
+
+# ifconfig under Linux is not that powerful and doesn't easily handle
+# multiple addresses
+# On the other hand, iproute2 is quite powerful and is also supported
+#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
+
+# You can also use iproute2 to add the default route.
+#defaultiproute="via 192.168.0.1"
+#defaultiproute6="via 2001:a:b:c"
+
+# ip doesn't handle MTU like ifconfig, but we can do it like so
+#ifup_eth0="ip link set \$int mtu 1500"
+
+# Create a bonded interface
+#interfaces="bond0"
+#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
+#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
+#ifdown_bond0="rmmod bonding"
+
+# Create tap interface and a bridge interface.
+# We add the tap to the bridge.
+# An external program, like dhcpcd, will configure the IP on the bridge
+#interfaces="tun0 br0"
+#ifup_tun0="tunctl -t \$int"
+#ifdown_tun0="tunctl -d \$int"
+#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
+#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
+
+# Create VLAN
+#interfaces="eth0_2 eth0_3 eth0_4"
+#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
+#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
+#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
+#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
+#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
+
+# Normally you would use wpa_supplicant to configure wireless, but you can
+# use iwconfig also
+#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     2984504c887afc9a36610eb7c20b097f7d1e70d0
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 16:35:12 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 16:46:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=2984504c

conf.d: remove staticroute file fragments

 conf.d/staticroute.BSD.in          | 6 ------
 conf.d/staticroute.GNU-kFreeBSD.in | 5 -----
 conf.d/staticroute.GNU.in          | 7 -------
 conf.d/staticroute.Linux.in        | 8 --------
 4 files changed, 26 deletions(-)

diff --git a/conf.d/staticroute.BSD.in b/conf.d/staticroute.BSD.in
deleted file mode 100644
index 4798473..0000000
--- a/conf.d/staticroute.BSD.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"

diff --git a/conf.d/staticroute.GNU-kFreeBSD.in b/conf.d/staticroute.GNU-kFreeBSD.in
deleted file mode 100644
index 9f54152..0000000
--- a/conf.d/staticroute.GNU-kFreeBSD.in
+++ /dev/null
@@ -1,5 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
-#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"

diff --git a/conf.d/staticroute.GNU.in b/conf.d/staticroute.GNU.in
deleted file mode 100644
index 58d77e3..0000000
--- a/conf.d/staticroute.GNU.in
+++ /dev/null
@@ -1,7 +0,0 @@
-# Separate multiple routes using ; or new lines.
-# /etc/route.conf(5) takes precedence over this configuration.
-
-# Example static routes. See route(8) for syntax.
-# FIXME: "net ..." not supported
-#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
-#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"

diff --git a/conf.d/staticroute.Linux.in b/conf.d/staticroute.Linux.in
deleted file mode 100644
index 68d22eb..0000000
--- a/conf.d/staticroute.Linux.in
+++ /dev/null
@@ -1,8 +0,0 @@
-# Separate multiple routes using ; or new lines.
-
-# Example static routes. See route(8) for syntax.
-#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
-#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
-
-# Example static routes using iproute2. See ip(8) for syntax.
-#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     2108285d64e2ee8cc03fbe544efc3752fe349bdd
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 15:22:17 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 16:46:30 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=2108285d

conf.d: remove network file fragnents

 conf.d/network.BSD.in          |  4 ----
 conf.d/network.GNU-kFreeBSD.in |  4 ----
 conf.d/network.GNU.in          |  4 ----
 conf.d/network.Linux.in        | 43 ------------------------------------------
 conf.d/network.in              | 28 ---------------------------
 5 files changed, 83 deletions(-)

diff --git a/conf.d/network.BSD.in b/conf.d/network.BSD.in
deleted file mode 100644
index 9f49b81..0000000
--- a/conf.d/network.BSD.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"

diff --git a/conf.d/network.GNU-kFreeBSD.in b/conf.d/network.GNU-kFreeBSD.in
deleted file mode 100644
index 9f49b81..0000000
--- a/conf.d/network.GNU-kFreeBSD.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="192.168.0.1"
-#defaultroute6="2001:a:b:c"

diff --git a/conf.d/network.GNU.in b/conf.d/network.GNU.in
deleted file mode 100644
index 78aa412..0000000
--- a/conf.d/network.GNU.in
+++ /dev/null
@@ -1,4 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"

diff --git a/conf.d/network.Linux.in b/conf.d/network.Linux.in
deleted file mode 100644
index f57ec91..0000000
--- a/conf.d/network.Linux.in
+++ /dev/null
@@ -1,43 +0,0 @@
-
-# You can assign a default route
-#defaultroute="gw 192.168.0.1"
-#defaultroute6="gw 2001:a:b:c"
-
-# ifconfig under Linux is not that powerful and doesn't easily handle
-# multiple addresses
-# On the other hand, ip (iproute2) is quite powerful and is also supported
-#ip_eth0="192.168.0.10/24; 192.168.10.10/24"
-
-# You can also use ip to add the default route.
-#defaultiproute="via 192.168.0.1"
-#defaultiproute6="via 2001:a:b:c"
-
-# ip doesn't handle MTU like ifconfig, but we can do it like so
-#ifup_eth0="ip link set \$int mtu 1500"
-
-# Create a bonded interface
-#interfaces="bond0"
-#ifup_bond0="modprobe bonding; ifconfig \$int up; ifenslave \$int bge0"
-#ifconfig_bond0="192.168.0.10 netmask 255.255.255.0"
-#ifdown_bond0="rmmod bonding"
-
-# Create tap interface and a bridge interface.
-# We add the tap to the bridge.
-# An external program, like dhcpcd, will configure the IP on the bridge
-#interfaces="tun0 br0"
-#ifup_tun0="tunctl -t \$int"
-#ifdown_tun0="tunctl -d \$int"
-#ifup_br0="brctl addbr \$int; brctl add \$int eth1; brtctl add \$int eth2"
-#ifdown_br0="ifconfig \$int down; btctl delbr \$int"
-
-# Create VLAN
-#interfaces="eth0_2 eth0_3 eth0_4"
-#ifup_eth0="vconfig add \$int 2; vconfig add \$int 3; vconfig add \$int 4"
-#ifconfig_eth0_2="192.168.2.10 netmask 255.255.255.0"
-#ifconfig_eth0_3="192.168.3.10 netmask 255.255.255.0"
-#ifconfig_eth0_4="192.168.4.10 netmask 255.255.255.0"
-#ifdown_eth0="vconfig rem \$int.2; vconfig rem \$int.3; vconfig rem \$int.4"
-
-# Normally you would use wpa_supplicant to configure wireless, but you can
-# use iwconfig also
-#ifup_wlan0="iwconfig \$int key s:secretkey enc open essid foobar"

diff --git a/conf.d/network.in b/conf.d/network.in
deleted file mode 100644
index d5477a0..0000000
--- a/conf.d/network.in
+++ /dev/null
@@ -1,28 +0,0 @@
-# Assign static IP addresses and run custom scripts per interface.
-# Seperate commands with ;
-# Prefix with ! to run a shell script.
-# Use \$int to represent the interface
-#ifconfig_eth0="192.168.0.10 netmask 255.255.255.0"
-
-# You also have ifup_eth0 and ifdown_eth0 to run other commands when
-# eth0 is started and stopped.
-# You should note that we don't stop the network at system shutdown by default.
-# If you really need this, then set keep_network=NO
-
-# Lastly, the interfaces variable pulls in virtual interfaces that cannot
-# be automatically detected.
-#interfaces="br0 bond0 vlan0"
-
-# You can also use files instead of variables here if you like:
-# /etc/ifconfig.eth0 is equivalent to ifconfig_eth0
-# /etc/ip.eth0 is equivalent to ifconfig_eth0
-# /etc/ifup.eth0 is equivalent to ifup_eth0
-# /etc/ifdown.eth0 is equivalent to ifdown_eth0
-# Any files found will automatically be put into the interfaces variable.
-# You don't need to escape variables in files, so use $int instead of \$int.
-
-# If you require DHCP, you should install dhcpcd and it to the boot or
-# default runlevel.
-
-# NIS users can set the domain name here
-#domainname="foobar"

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     35e8386c24df6483f2918979dae150421f7151df
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 19 16:21:44 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 19 16:46:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=35e8386c

conf.d: makestaticroute file static

 conf.d/.gitignore  |  1 -
 conf.d/Makefile    |  5 -----
 conf.d/staticroute | 26 ++++++++++++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/conf.d/.gitignore b/conf.d/.gitignore
deleted file mode 100644
index a228e5d..0000000
--- a/conf.d/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-staticroute

diff --git a/conf.d/Makefile b/conf.d/Makefile
index 25dff8e..a1cc7fb 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -6,8 +6,6 @@ CONF=	bootmisc fsck hostname localmount netmount urandom tmpfiles \
 
 ifeq (${MKNET},yes)
 CONF+= network staticroute
-TARGETS+=	staticroute
-CLEANFILES+=	staticroute
 endif
 
 MK=	../mk
@@ -21,6 +19,3 @@ CONF-Linux=	consolefont devfs dmesg hwclock keymaps killprocs modules mtab \
 CONF-NetBSD=	moused rarpd savecore
 
 include ${MK}/scripts.mk
-
-staticroute: staticroute${SFX}
-	cp $@${SFX} $@

diff --git a/conf.d/staticroute b/conf.d/staticroute
new file mode 100644
index 0000000..19d0961
--- /dev/null
+++ b/conf.d/staticroute
@@ -0,0 +1,26 @@
+# Static routes are defined differently depending on your operating
+# system, so please be sure to use the correct syntax.
+# Do not use this file to define the default route.
+# In all settings, multiple routes should be separated using ; or new lines.
+
+# Define static routes on Linux using route. See route(8) for syntax.
+#staticroute="net 192.168.0.0 netmask 255.255.255.0 gw 10.73.1.1
+#net 192.168.1.0 netmask 255.255.255.0 gw 10.73.1.1"
+
+# Define static routes on Linux using iproute2. See ip(8) for syntax.
+#staticiproute="192.168.0.0/24 via 10.73.1.1; 192.168.1.0/24 via 10.73.1.1"
+
+# Define static routes on GNU/Hurd. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+# FIXME: "net ..." not supported
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 --address 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 --address 10.73.1.1"
+
+# Define static routes on GNU/KFreeBSD. See route(8) for syntax.
+#staticroute="net 192.168.0.0 10.73.1.1 netmask 255.255.255.0
+#net 192.168.1.0 10.73.1.1 netmask 255.255.255.0"
+
+# Define static routes on other BSD systems. See route(8) for syntax.
+# /etc/route.conf(5) takes precedence over this configuration.
+#staticroute="net 192.168.0.0 -netmask 255.255.255.0 10.73.1.1
+#net 192.168.1.0 -netmask 255.255.255.0 10.73.1.1"

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     20b60ea904612669dfb744beffcd8e7e447f69ef
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Thu Nov  3 16:57:40 2016 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Thu Nov  3 16:57:40 2016 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=20b60ea9

conf.d/net-online: clarify comment about interfaces setting

This setting refers to all interfaces that support ethernet

 conf.d/net-online | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/conf.d/net-online b/conf.d/net-online
index bf0b09a..aa2c76b 100644
--- a/conf.d/net-online
+++ b/conf.d/net-online
@@ -1,6 +1,6 @@
 # The interfaces setting controls which interfaces the net-online
-# service considers in deciding whether the network is active. By
-# default, it is all ethernet or wireless LAN interfaces.
+# service considers in deciding whether the network is active. The
+# default is all interfaces that support ethernet.
 #interfaces=""
 
 # This setting controls whether a ping to the default gateway is

[gentoo-commits] proj/openrc:master commit in: conf.d/

[William Hubbs]

commit:     72bb2e57de935ab46ad000f97a5720265bed9342
Author:     John R. Graham <john_r_graham <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 22:14:08 2017 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 22:24:13 2017 +0000
URL:        https://gitweb.gentoo.org/proj/openrc.git/commit/?id=72bb2e57

Typo fix

X-Gentoo-Bug: 624908
X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=624908

 conf.d/localmount | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conf.d/localmount b/conf.d/localmount
index e7277194..25ca3cd6 100644
--- a/conf.d/localmount
+++ b/conf.d/localmount
@@ -3,7 +3,7 @@
 #no_umounts="/dir1:/var/dir2"
 #
 # Mark certain mount points as critical.
-# This contains aspace separated list of mount points which should be
+# This contains a space separated list of mount points which should be
 # considered critical. If one of these mount points cannot be mounted,
 # localmount will fail.
 # By default, this is empty.