summaryrefslogtreecommitdiff
path: root/runlevels
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2008-10-10 08:37:21 +0000
committerRoy Marples <roy@marples.name>2008-10-10 08:37:21 +0000
commitd6da8e8c48feb8faf9287fc86fbbf0890c37a87c (patch)
treee6cdf21f0f3a3270b705fe14b876f92b14b38dbf /runlevels
parent247766695cd7c5e8d83dff72f7eb7e6578bf57b8 (diff)
downloadopenrc-d6da8e8c48feb8faf9287fc86fbbf0890c37a87c.tar.gz
openrc-d6da8e8c48feb8faf9287fc86fbbf0890c37a87c.tar.bz2
openrc-d6da8e8c48feb8faf9287fc86fbbf0890c37a87c.tar.xz
sysinit is now a real runlevel that handles things like udev, dmesg and
mounting various bits in /dev and /sys. init.sh JUST mounts /lib/rc/init.d (and /proc for Linux systems) To make development of this easier we now return an empty RC_STRINGLIST instead of a NULL for empty things. If you don't have a udev init script installed, don't reboot your box OR roll back to an older OpenRC version.
Diffstat (limited to 'runlevels')
-rw-r--r--runlevels/Makefile9
-rw-r--r--runlevels/Makefile.Linux4
2 files changed, 11 insertions, 2 deletions
diff --git a/runlevels/Makefile b/runlevels/Makefile
index 41ba12b..9e3131a 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -3,6 +3,7 @@ BOOT= bootmisc fsck hostname localmount \
DEFAULT= local netmount
LEVELDIR= ${DESTDIR}/${SYSCONFDIR}/runlevels
+SYSINITDIR= ${LEVELDIR}/sysinit
BOOTDIR= ${LEVELDIR}/boot
DEFAULTDIR= ${LEVELDIR}/default
@@ -17,6 +18,14 @@ include Makefile.${OS}
all:
install:
+ if ! test -d "${SYSINITDIR}"; then \
+ ${INSTALL} -d ${SYSINITDIR} || exit $$?; \
+ for x in ${SYSINIT}; do \
+ if test -n "${PREFIX}"; then \
+ grep -q "keyword .*noprefix" ${INITDIR}/"$$x" && continue; \
+ fi; \
+ ln -snf ${PREFIX}/etc/init.d/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
+ fi
if ! test -d "${BOOTDIR}"; then \
${INSTALL} -d ${BOOTDIR} || exit $$?; \
for x in ${BOOT}; do \
diff --git a/runlevels/Makefile.Linux b/runlevels/Makefile.Linux
index 31b4862..c5649b2 100644
--- a/runlevels/Makefile.Linux
+++ b/runlevels/Makefile.Linux
@@ -1,2 +1,2 @@
-BOOT+= hwclock consolefont keymaps modules mtab net.lo procfs \
- termencoding
+SYSINIT+= devfs dmesg
+BOOT+= hwclock keymaps modules mtab net.lo procfs termencoding