[gentoo-commits] proj/openrc:0.22.x commit in: init.d/

2016-11-03 Thread William Hubbs 
commit: 2bad4da89119c0385f9c92baef148590fb576c88
Author: William Hubbs  gmail  com>
AuthorDate: Thu Nov  3 17:47:01 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Nov  3 18:26:19 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=2bad4da8

init.d/loopback.in: drop the route to the loopback interface on Linux

This is related to #103.

 init.d/loopback.in | 2 --
 1 file changed, 2 deletions(-)

diff --git a/init.d/loopback.in b/init.d/loopback.in
index 59bdae2..61f21cd 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -22,11 +22,9 @@ start()
ebegin "Bringing up network interface lo"
if command -v ip > /dev/null 2>&1; then
ip addr add 127.0.0.1/8 dev lo brd +
-   ip route add 127.0.0.0/8 dev lo
ip link set lo up
else
ifconfig lo 127.0.0.1 netmask 255.0.0.0
-   route add -net 127.0.0.0 netmask 255.0.0.0 gw 127.0.0.1
fi
else
ebegin "Bringing up network interface lo0"

[gentoo-commits] proj/openrc:0.22.x commit in: init.d/

2016-11-03 Thread William Hubbs 
commit: 3c5244fb6acaed01cd186c356e2730f12c77ca99
Author: William Hubbs  gmail  com>
AuthorDate: Thu Nov  3 17:29:21 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Nov  3 18:20:48 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=3c5244fb

init.d/mount-ro: do not remount /usr read only if it is premounted

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

 init.d/mount-ro.in | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 589f1a2..3553b7a 100644
--- a/init.d/mount-ro.in
+++ b/init.d/mount-ro.in
@@ -34,6 +34,9 @@ start()
 
local m="/dev|/dev/.*|/proc|/proc.*|/sys|/sys/.*|/run|${rc_svcdir}" x= 
fs=
m="$m|/bin|/sbin|/lib(32|64)?|/libexec"
+   if [ -e "$rc_svcdir"/usr_premounted ]; then
+   m="$m|/usr"
+   fi
# RC_NO_UMOUNTS is an env var that can be set by plugins
local IFS="$IFS:"
for x in $no_umounts $RC_NO_UMOUNTS; do

[gentoo-commits] proj/openrc:0.22.x commit in: init.d/

2016-11-03 Thread William Hubbs 
commit: 9f68514f8ab9a2d4bf7e095b3a41b3c2043d07fe
Author: William Hubbs  gmail  com>
AuthorDate: Thu Nov  3 16:18:20 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Nov  3 18:20:48 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=9f68514f

init.d/net-online: remove interfaces and timeout from local declarations

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

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

diff --git a/init.d/net-online.in b/init.d/net-online.in
index 3e18ba9..dd3548d 100644
--- a/init.d/net-online.in
+++ b/init.d/net-online.in
@@ -42,8 +42,8 @@ get_default_gateway()
 
 start ()
 {
-   local carriers configured dev gateway ifcount infinite interfaces
-   local rc state timeout x
+   local carriers configured dev gateway ifcount infinite
+   local rc state x
 
ebegin "Checking to see if the network is online"
rc=0

[gentoo-commits] proj/openrc:0.22.x commit in: /, init.d/

2016-11-03 Thread William Hubbs 
commit: 5dc13a0ff21f2e0a0b23e32e864a19f7f0a2766f
Author: Robin H. Johnson  gentoo  org>
AuthorDate: Mon Oct 24 21:19:22 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Nov  3 18:20:48 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=5dc13a0f

init.d/loopback: drop scope on loopback

Busybox does not support the 'scope' argument on 'ip address add' or 'ip
route add', this is documented in BUSYBOX.md, but is no longer actually
needed, as the kernel does get it right without manual specification,
and the ifconfig variant already relies on the kernel to get it right.
This is part of #103.

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

 BUSYBOX.md | 3 ---
 init.d/loopback.in | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/BUSYBOX.md b/BUSYBOX.md
index db7ca51..c8a78e7 100644
--- a/BUSYBOX.md
+++ b/BUSYBOX.md
@@ -22,9 +22,6 @@ or recognize the nofail option in fstab.
 
 CONFIG_SETFONT -- The setfont applet does not support the -u option from kbd.
 
-CONFIG_IP -- The ip applet  doesn't support the "scope" modifier for
-"ip route add" and "ip address add".
-
 CONFIG_BB_SYSCTL -- The sysctl applet does not support the --system command
 line switch.
 

diff --git a/init.d/loopback.in b/init.d/loopback.in
index f76dfce..59bdae2 100644
--- a/init.d/loopback.in
+++ b/init.d/loopback.in
@@ -21,8 +21,8 @@ start()
if [ "$RC_UNAME" = Linux ]; then
ebegin "Bringing up network interface lo"
if command -v ip > /dev/null 2>&1; then
-   ip addr add 127.0.0.1/8 dev lo brd + scope host
-   ip route add 127.0.0.0/8 dev lo scope host
+   ip addr add 127.0.0.1/8 dev lo brd +
+   ip route add 127.0.0.0/8 dev lo
ip link set lo up
else
ifconfig lo 127.0.0.1 netmask 255.0.0.0

[gentoo-commits] proj/openrc:0.22.x commit in: init.d/

2016-10-06 Thread William Hubbs 
commit: a537bd7abb8d3d1841635c78f9163e6d1abad0ba
Author: William Hubbs  gmail  com>
AuthorDate: Thu Oct  6 03:43:56 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Thu Oct  6 13:31:21 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a537bd7a

init.d/sysfs: load efivarfs module when booting in efi mode

The presence of /sys/firmware/efi is used to indicate that the system
was booted in efi mode.

 init.d/sysfs.in | 27 ---
 1 file changed, 16 insertions(+), 11 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index 7183e5d..6d6ec62 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -99,17 +99,22 @@ mount_misc()
fi
 
# set up kernel support for efivarfs
-   if [ ! -d /sys/firmware/efi/efivars ] && modprobe -q efivarfs; then
-   ewarn "The efivarfs module needs to be configured in " \
- "@SYSCONFDIR@/conf.d/modules or built in"
-   fi
-   if [ -d /sys/firmware/efi/efivars ] &&
-   ! mountinfo -q /sys/firmware/efi/efivars; then
-   if grep -qs efivarfs /proc/filesystems; then
-   ebegin "Mounting efivarfs filesystem"
-   mount -n -t efivarfs -o ${sysfs_opts} \
-   efivarfs /sys/firmware/efi/efivars
-   eend $?
+   # The presence of /sys/firmware/efi indicates that the system was
+   # booted in efi mode.
+   if [ -d /sys/firmware/efi ]; then
+   if [ ! -d /sys/firmware/efi/efivars ] &&
+   modprobe -q efivarfs; then
+   ewarn "The efivarfs module needs to be configured in " \
+ "@SYSCONFDIR@/conf.d/modules or built in"
+   fi
+   if [ -d /sys/firmware/efi/efivars ] &&
+   ! mountinfo -q /sys/firmware/efi/efivars; then
+   if grep -qs efivarfs /proc/filesystems; then
+   ebegin "Mounting efivarfs filesystem"
+   mount -n -t efivarfs -o ${sysfs_opts} \
+   efivarfs /sys/firmware/efi/efivars
+   eend $?
+   fi
fi
fi
 }

[gentoo-commits] proj/openrc:0.22.x commit in: init.d/

2016-10-05 Thread William Hubbs 
commit: a13f2b91b2e5337d659844be19fd302a0f21b288
Author: William Hubbs  gmail  com>
AuthorDate: Tue Oct  4 23:18:05 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Oct  5 16:41:40 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=a13f2b91

init.d/sysfs: fix efivarfs module test

 init.d/sysfs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index acaae16..7183e5d 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -99,7 +99,7 @@ mount_misc()
fi
 
# set up kernel support for efivarfs
-   if [ ! -d /sys/module/efivarfs ] && modprobe -q efivarfs; then
+   if [ ! -d /sys/firmware/efi/efivars ] && modprobe -q efivarfs; then
ewarn "The efivarfs module needs to be configured in " \
  "@SYSCONFDIR@/conf.d/modules or built in"
fi

[gentoo-commits] proj/openrc:0.22.x commit in: init.d/

2016-10-05 Thread William Hubbs 
commit: b5a7222fe062c691ba5d05d27195eeb646c90b86
Author: William Hubbs  gmail  com>
AuthorDate: Tue Oct  4 16:51:24 2016 +
Commit: William Hubbs  gentoo  org>
CommitDate: Wed Oct  5 16:41:40 2016 +
URL:https://gitweb.gentoo.org/proj/openrc.git/commit/?id=b5a7222f

init.d/sysfs: fix efivarfs handling

Separate loading the module, if it isn't built in or loaded, from
mounting the file system.

This also makes sure the warning about configuring the module in
/etc/conf.d/modules or building it in is displayed only if it is loaded
successfully.

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

 init.d/sysfs.in | 16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index b9478f8..acaae16 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -98,15 +98,13 @@ mount_misc()
fi
fi
 
-   # setup up kernel support for efivarfs
-   # slightly complicated, as if it's build as a module but NOT yet loaded,
-   # it will NOT appear in /proc/filesystems yet
-   if [ -d /sys/firmware/efi/efivars ] \
-   && ! mountinfo -q /sys/firmware/efi/efivars; then
-   if modprobe -q efivarfs; then
-   ewarn "The efivarfs module needs to be configured in" \
-   "@SYSCONFDIR@/conf.d/modules or built in"
-   fi
+   # set up kernel support for efivarfs
+   if [ ! -d /sys/module/efivarfs ] && modprobe -q efivarfs; then
+   ewarn "The efivarfs module needs to be configured in " \
+ "@SYSCONFDIR@/conf.d/modules or built in"
+   fi
+   if [ -d /sys/firmware/efi/efivars ] &&
+   ! mountinfo -q /sys/firmware/efi/efivars; then
if grep -qs efivarfs /proc/filesystems; then
ebegin "Mounting efivarfs filesystem"
mount -n -t efivarfs -o ${sysfs_opts} \