From 3e2018f5e9c5cfd4ba8066747fc02dac1ce22f59 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Sun, 8 Jul 2012 15:02:11 -0500 Subject: Revert "Deprecate the network and staticroute scripts" This reverts commit 5994e55937cbbb71b1c22ad829b77a1bcd8c3793. There are situations where these scripts can be useful, so I am bringing them back. Also, I want to start discussions about simplifying the OpenRC network stack. --- runlevels/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'runlevels/Makefile') diff --git a/runlevels/Makefile b/runlevels/Makefile index 468a3753..ac3796e0 100644 --- a/runlevels/Makefile +++ b/runlevels/Makefile @@ -1,5 +1,5 @@ -BOOT= bootmisc fsck hostname localmount \ - root swap swapfiles sysctl urandom ${BOOT-${OS}} +BOOT= bootmisc fsck hostname localmount network \ + root staticroute swap swapfiles sysctl urandom ${BOOT-${OS}} DEFAULT= local netmount SHUTDOWN= savecache ${SHUTDOWN-${OS}} SYSINIT= ${SYSINIT-${OS}} @@ -10,6 +10,8 @@ BOOTDIR= ${LEVELDIR}/boot DEFAULTDIR= ${LEVELDIR}/default SHUTDOWNDIR= ${LEVELDIR}/shutdown +INITDIR= ../init.d + MK= ../mk include ${MK}/sys.mk include ${MK}/os.mk @@ -22,16 +24,16 @@ SYSINIT-${OS}= BOOT-BSD= hostid newsyslog savecore syslogd swap-blk # Generic BSD stuff -BOOT-FreeBSD= hostid net.lo0 newsyslog savecore syslogd +BOOT-FreeBSD= hostid newsyslog savecore syslogd # FreeBSD specific stuff BOOT-FreeBSD+= adjkerntz dumpon syscons -BOOT-Linux= hwclock keymaps modules mtab net.lo 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 net.lo0 newsyslog savecore syslogd +BOOT-NetBSD= hostid newsyslog savecore syslogd # NetBSD specific stuff BOOT-NetBSD+= devdb swap-blk ttys wscons -- cgit v1.2.3