summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/rootfs/openrc/etc/init.d/bootmisc1
-rw-r--r--mk/rootfs/openrc/etc/init.d/network1
-rw-r--r--mk/rootfs/openrc/etc/init.d/sysctl5
-rw-r--r--mk/rootfs/openrc/openrc.mk8
-rw-r--r--src/rootfs_skel/etc/inittab3
l---------src/rootfs_skel/run1
6 files changed, 11 insertions, 8 deletions
diff --git a/mk/rootfs/openrc/etc/init.d/bootmisc b/mk/rootfs/openrc/etc/init.d/bootmisc
index e66824d..8a1b008 100644
--- a/mk/rootfs/openrc/etc/init.d/bootmisc
+++ b/mk/rootfs/openrc/etc/init.d/bootmisc
@@ -4,6 +4,7 @@
depend()
{
+ need localmount
after root sysctl
keyword -timeout
}
diff --git a/mk/rootfs/openrc/etc/init.d/network b/mk/rootfs/openrc/etc/init.d/network
index 4333500..cebcc0c 100644
--- a/mk/rootfs/openrc/etc/init.d/network
+++ b/mk/rootfs/openrc/etc/init.d/network
@@ -11,6 +11,7 @@ __nl="
depend()
{
need localmount
+ after bootmisc
if [ -n "$(interfaces)" ]; then
provide net
fi
diff --git a/mk/rootfs/openrc/etc/init.d/sysctl b/mk/rootfs/openrc/etc/init.d/sysctl
index a9faf59..390e72a 100644
--- a/mk/rootfs/openrc/etc/init.d/sysctl
+++ b/mk/rootfs/openrc/etc/init.d/sysctl
@@ -2,6 +2,11 @@
# Copyright (c) 2007-2008 Roy Marples <roy@marples.name>
# Released under the 2-clause BSD license.
+depend()
+{
+ before bootmisc
+}
+
start()
{
local conf= retval=0 err errs
diff --git a/mk/rootfs/openrc/openrc.mk b/mk/rootfs/openrc/openrc.mk
index d14b27e..81120e5 100644
--- a/mk/rootfs/openrc/openrc.mk
+++ b/mk/rootfs/openrc/openrc.mk
@@ -1,5 +1,5 @@
################################################################################
-# Copyright(C) 2013 Abdoulaye Walsimou GAYE.
+# Copyright(C) 2013-2014 Abdoulaye Walsimou GAYE.
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -34,9 +34,9 @@ embtk_openrc_mk := $(EMBTK_ROOT)/mk/rootfs/openrc
# sysinit runlevel scripts
embtk_openrc_sysinit := devfs dmesg sysfs
# boot runlevel scripts
-embtk_openrc_boot := hostname localmount loopback modules mtab network
-embtk_openrc_boot += procfs root staticroute swap sysctl urandom
-# defaultrunlevel scripts
+embtk_openrc_boot := bootmisc hostname localmount loopback modules mtab
+embtk_openrc_boot += network procfs root staticroute swap sysctl urandom
+# default runlevel scripts
embtk_openrc_default := netmount
# shutdown runlevel scripts
embtk_openrc_shutdown := killprocs
diff --git a/src/rootfs_skel/etc/inittab b/src/rootfs_skel/etc/inittab
index 47a5790..ee7818e 100644
--- a/src/rootfs_skel/etc/inittab
+++ b/src/rootfs_skel/etc/inittab
@@ -1,7 +1,4 @@
# Initial system critical filesystems mounting (/proc, /dev, /sys, etc.)
-# FIXME: Cleanup this for /tmp
-null::sysinit:/bin/mount -a
-
::sysinit:/sbin/openrc sysinit
::wait:/sbin/openrc boot
::wait:/sbin/openrc default
diff --git a/src/rootfs_skel/run b/src/rootfs_skel/run
deleted file mode 120000
index 0f0d788..0000000
--- a/src/rootfs_skel/run
+++ /dev/null
@@ -1 +0,0 @@
-/var/run \ No newline at end of file