diff options
author | William Hubbs <w.d.hubbs@gmail.com> | 2012-07-08 15:02:11 -0500 |
---|---|---|
committer | William Hubbs <w.d.hubbs@gmail.com> | 2012-07-08 19:51:36 -0500 |
commit | 3e2018f5e9c5cfd4ba8066747fc02dac1ce22f59 (patch) | |
tree | 97e9c85c1f2a6a069976bd0062de540d2593b79c /runlevels | |
parent | dceeef9fe568bd633ed72ca995a1846a9dc20689 (diff) |
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.
Diffstat (limited to 'runlevels')
-rw-r--r-- | runlevels/Makefile | 12 |
1 files changed, 7 insertions, 5 deletions
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 |