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

[William Hubbs]

commit:     006fbdce83a8b75766f9d6deeedefef001f15b32
Author:     William Hubbs <w.d.hubbs <AT> gmail <DOT> com>
AuthorDate: Tue Jul 10 17:18:06 2012 +0000
Commit:     William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 17:18:06 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/openrc.git;a=commit;h=006fbdce

fix the upstream default network stack

The OpenRC upstream default network stack was changed, but there was no
reason to change it. Now since we have the MKNET build switch, it is
easy for the gentoo ebuild to install oldnet by default.

The upstream default is newnet.

---
 Makefile           |    2 +-
 README             |    2 +-
 conf.d/Makefile    |    2 +-
 init.d/Makefile    |    8 ++++----
 runlevels/Makefile |   18 +++++++++---------
 5 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 593952a..b37de6b 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ include Makefile.inc
 SUBDIR=		conf.d etc init.d local.d man scripts sh src sysctl.d
 
 # Build our old net foo or not
-ifeq (${MKNET},)
+ifeq (${MKNET},oldnet)
 SUBDIR+=	net doc
 endif
 

diff --git a/README b/README
index 71bf00d..8244b04 100644
--- a/README
+++ b/README
@@ -10,7 +10,7 @@ You may wish to tweak the installation with the below arguments
 PROGLDFLAGS=-static
 LIBNAME=lib64
 DESTDIR=/tmp/openrc-image
-MKNET=newnet
+MKNET=oldnet
 MKPAM=pam
 MKPKGCONFIG=no
 MKSELINUX=yes

diff --git a/conf.d/Makefile b/conf.d/Makefile
index 412efae..6ed295d 100644
--- a/conf.d/Makefile
+++ b/conf.d/Makefile
@@ -1,7 +1,7 @@
 DIR=	${CONFDIR}
 CONF=	bootmisc fsck hostname localmount urandom ${CONF-${OS}}
 
-ifeq (${MKNET},newnet)
+ifeq (${MKNET},)
 CONF+= network staticroute
 TARGETS+=	network staticroute
 CLEANFILES+=	network staticroute

diff --git a/init.d/Makefile b/init.d/Makefile
index d5c3ea8..a34ee90 100644
--- a/init.d/Makefile
+++ b/init.d/Makefile
@@ -6,12 +6,12 @@ BIN=	${OBJS}
 
 # Build our old net foo or not
 ifeq (${MKNET},)
-INSTALLAFTER=	_installafter_net.lo
-SRCS+= net.lo.in
+SRCS+= network.in staticroute.in
 endif
 
-ifeq (${MKNET},newnet)
-SRCS+= network.in staticroute.in
+ifeq (${MKNET},oldnet)
+INSTALLAFTER=	_installafter_net.lo
+SRCS+= net.lo.in
 endif
 
 MK=	../mk

diff --git a/runlevels/Makefile b/runlevels/Makefile
index 2b25a35..25fa029 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -11,12 +11,6 @@ DEFAULTDIR=	${LEVELDIR}/default
 SHUTDOWNDIR=	${LEVELDIR}/shutdown
 
 ifeq (${MKNET},)
-BOOT-FreeBSD += net.lo0
-BOOT-Linux += net.lo
-BOOT-NetBSD += net.lo0
-endif
-
-ifeq (${MKNET},newnet)
 BOOT+= network staticroute
 endif
 
@@ -31,19 +25,25 @@ BOOT-${OS}=
 SHUTDOWN-${OS}=
 SYSINIT-${OS}=
 
+ifeq (${MKNET},oldnet)
+BOOT-FreeBSD+= net.lo0
+BOOT-Linux+= net.lo
+BOOT-NetBSD+= net.lo0
+endif
+
 BOOT-BSD=	hostid newsyslog savecore syslogd swap-blk
 
 # Generic BSD stuff
-BOOT-FreeBSD=	hostid newsyslog savecore syslogd
+BOOT-FreeBSD+=	hostid newsyslog savecore syslogd
 # FreeBSD specific stuff
 BOOT-FreeBSD+=	adjkerntz dumpon syscons
 
-BOOT-Linux=	hwclock keymaps modules mtab procfs termencoding
+BOOT-Linux+=	hwclock keymaps modules mtab procfs termencoding
 SHUTDOWN-Linux=	killprocs mount-ro
 SYSINIT-Linux=	devfs dmesg
 
 # Generic BSD stuff
-BOOT-NetBSD=	hostid newsyslog savecore syslogd
+BOOT-NetBSD+=	hostid newsyslog savecore syslogd
 # NetBSD specific stuff
 BOOT-NetBSD+=	devdb swap-blk ttys wscons