diff options
| author | William Hubbs <w.d.hubbs@gmail.com> | 2012-07-10 12:18:06 -0500 |
|---|---|---|
| committer | William Hubbs <w.d.hubbs@gmail.com> | 2012-07-10 12:18:06 -0500 |
| commit | 006fbdce83a8b75766f9d6deeedefef001f15b32 (patch) | |
| tree | 6e0df158152a4f4e542b6d4293c8ad8575ff4f91 | |
| parent | 60d6847de553970a80207fde6bd46f5f3696e049 (diff) | |
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.
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | README | 2 | ||||
| -rw-r--r-- | conf.d/Makefile | 2 | ||||
| -rw-r--r-- | init.d/Makefile | 8 | ||||
| -rw-r--r-- | runlevels/Makefile | 18 |
5 files changed, 16 insertions, 16 deletions
@@ -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 @@ -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 412efae6..6ed295d5 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 d5c3ea8b..a34ee90a 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 2b25a350..25fa029f 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 |