From e52d952ca5a4259e7bebfd32e65084294ef32746 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Sun, 10 Sep 2017 13:29:15 +0200
Subject: [PATCH] Alpine: Move bootstrap services and setup from finit.conf to
 finit.d/*.conf

Signed-off-by: Joachim Nilsson <troglobit@gmail.com>
---
 contrib/alpine/finit.conf                     | 17 +++--------------
 contrib/alpine/finit.d/available/keymap.conf  |  2 ++
 contrib/alpine/finit.d/available/klogd.conf   |  2 ++
 contrib/alpine/finit.d/available/modules.conf |  6 ++++++
 contrib/alpine/finit.d/available/syslogd.conf |  2 ++
 contrib/alpine/finit.d/keymap.conf            |  1 +
 contrib/alpine/finit.d/klogd.conf             |  1 +
 contrib/alpine/finit.d/modules.conf           |  1 +
 contrib/alpine/finit.d/syslogd.conf           |  1 +
 9 files changed, 19 insertions(+), 14 deletions(-)
 create mode 100644 contrib/alpine/finit.d/available/keymap.conf
 create mode 100644 contrib/alpine/finit.d/available/klogd.conf
 create mode 100644 contrib/alpine/finit.d/available/modules.conf
 create mode 100644 contrib/alpine/finit.d/available/syslogd.conf
 create mode 120000 contrib/alpine/finit.d/keymap.conf
 create mode 120000 contrib/alpine/finit.d/klogd.conf
 create mode 120000 contrib/alpine/finit.d/modules.conf
 create mode 120000 contrib/alpine/finit.d/syslogd.conf

diff --git a/contrib/alpine/finit.conf b/contrib/alpine/finit.conf
index 0fc140a3..741abc72 100644
--- a/contrib/alpine/finit.conf
+++ b/contrib/alpine/finit.conf
@@ -4,21 +4,10 @@
 #
 # See /etc/finit.d/*.conf and `initctl list` for other services
 
-## Linux kernel modules to load
-#module fbcon
-module button
-module evdev
-module mousedev
-module 8139cp
-
 ## Runlevel to start after bootstrap, runlevel 'S'
-runlevel 2
+# Default is 2
+#runlevel 2
 
 ## Bootstrap services and tasks
+# Can be listed here or in /etc/finit.d/*.conf
 
-# Services to be monitored and respawned as needed
-service [S12345] /sbin/klogd -n                   -- Kernel log daemon
-service [S12345] /sbin/syslogd -n                 -- Syslog daemon
-
-# Misc oneshot bootstrap tasks
-task [S] zcat /etc/keymap/se.bmap.gz | loadkmap   -- Loading keymap
diff --git a/contrib/alpine/finit.d/available/keymap.conf b/contrib/alpine/finit.d/available/keymap.conf
new file mode 100644
index 00000000..203253b3
--- /dev/null
+++ b/contrib/alpine/finit.d/available/keymap.conf
@@ -0,0 +1,2 @@
+# Oneshot task to run once at bootstrap
+task [S] zcat /etc/keymap/se.bmap.gz | loadkmap -- Loading keymap
diff --git a/contrib/alpine/finit.d/available/klogd.conf b/contrib/alpine/finit.d/available/klogd.conf
new file mode 100644
index 00000000..1ce3570b
--- /dev/null
+++ b/contrib/alpine/finit.d/available/klogd.conf
@@ -0,0 +1,2 @@
+# Start klogd as soon as possible, should always run
+service [S12345] /sbin/klogd -n -- Kernel log daemon
diff --git a/contrib/alpine/finit.d/available/modules.conf b/contrib/alpine/finit.d/available/modules.conf
new file mode 100644
index 00000000..1f1ec5b3
--- /dev/null
+++ b/contrib/alpine/finit.d/available/modules.conf
@@ -0,0 +1,6 @@
+## Linux kernel modules to load
+#module fbcon
+module button
+module evdev
+module mousedev
+module 8139cp
diff --git a/contrib/alpine/finit.d/available/syslogd.conf b/contrib/alpine/finit.d/available/syslogd.conf
new file mode 100644
index 00000000..013b7c60
--- /dev/null
+++ b/contrib/alpine/finit.d/available/syslogd.conf
@@ -0,0 +1,2 @@
+# Start syslogd as soon as possible, should always run
+service [S12345] /sbin/syslogd -n -- Syslog daemon
diff --git a/contrib/alpine/finit.d/keymap.conf b/contrib/alpine/finit.d/keymap.conf
new file mode 120000
index 00000000..b7d3d41e
--- /dev/null
+++ b/contrib/alpine/finit.d/keymap.conf
@@ -0,0 +1 @@
+available/keymap.conf
\ No newline at end of file
diff --git a/contrib/alpine/finit.d/klogd.conf b/contrib/alpine/finit.d/klogd.conf
new file mode 120000
index 00000000..f21606d3
--- /dev/null
+++ b/contrib/alpine/finit.d/klogd.conf
@@ -0,0 +1 @@
+available/klogd.conf
\ No newline at end of file
diff --git a/contrib/alpine/finit.d/modules.conf b/contrib/alpine/finit.d/modules.conf
new file mode 120000
index 00000000..edd6cc7b
--- /dev/null
+++ b/contrib/alpine/finit.d/modules.conf
@@ -0,0 +1 @@
+available/modules.conf
\ No newline at end of file
diff --git a/contrib/alpine/finit.d/syslogd.conf b/contrib/alpine/finit.d/syslogd.conf
new file mode 120000
index 00000000..e58be163
--- /dev/null
+++ b/contrib/alpine/finit.d/syslogd.conf
@@ -0,0 +1 @@
+available/syslogd.conf
\ No newline at end of file