about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--core-services/08-sysctl.sh14
-rw-r--r--services/agetty-hvc0/conf3
l---------services/agetty-hvc0/finish1
l---------services/agetty-hvc0/run1
l---------services/agetty-hvc0/supervise1
-rw-r--r--services/agetty-hvsi0/conf8
l---------services/agetty-hvsi0/finish1
l---------services/agetty-hvsi0/run1
l---------services/agetty-hvsi0/supervise1
9 files changed, 26 insertions, 5 deletions
diff --git a/core-services/08-sysctl.sh b/core-services/08-sysctl.sh
index 37d7b9f..3df5c5a 100644
--- a/core-services/08-sysctl.sh
+++ b/core-services/08-sysctl.sh
@@ -2,15 +2,19 @@
 
 if [ -x /sbin/sysctl -o -x /bin/sysctl ]; then
     msg "Loading sysctl(8) settings..."
+    mkdir -p /run/vsysctl.d
     for i in /run/sysctl.d/*.conf \
         /etc/sysctl.d/*.conf \
         /usr/local/lib/sysctl.d/*.conf \
-        /usr/lib/sysctl.d/*.conf \
-        /etc/sysctl.conf; do
+        /usr/lib/sysctl.d/*.conf; do
 
-        if [ -e "$i" ]; then
-            printf '* Applying %s ...\n' "$i"
-            sysctl -p "$i"
+        if [ -e "$i" ] && [ ! -e "/run/vsysctl.d/${i##*/}" ]; then
+            ln -s "$i" "/run/vsysctl.d/${i##*/}"
         fi
     done
+    for i in /run/vsysctl.d/*.conf; do
+        sysctl -p "$i"
+    done
+    rm -rf -- /run/vsysctl.d
+    sysctl -p /etc/sysctl.conf
 fi
diff --git a/services/agetty-hvc0/conf b/services/agetty-hvc0/conf
new file mode 100644
index 0000000..ecf4f1e
--- /dev/null
+++ b/services/agetty-hvc0/conf
@@ -0,0 +1,3 @@
+GETTY_ARGS="-L"
+BAUD_RATE=9600
+TERM_NAME=vt100
diff --git a/services/agetty-hvc0/finish b/services/agetty-hvc0/finish
new file mode 120000
index 0000000..ad464cb
--- /dev/null
+++ b/services/agetty-hvc0/finish
@@ -0,0 +1 @@
+../agetty-generic/finish
\ No newline at end of file
diff --git a/services/agetty-hvc0/run b/services/agetty-hvc0/run
new file mode 120000
index 0000000..ffa62a5
--- /dev/null
+++ b/services/agetty-hvc0/run
@@ -0,0 +1 @@
+../agetty-serial/run
\ No newline at end of file
diff --git a/services/agetty-hvc0/supervise b/services/agetty-hvc0/supervise
new file mode 120000
index 0000000..665ccf0
--- /dev/null
+++ b/services/agetty-hvc0/supervise
@@ -0,0 +1 @@
+/run/runit/supervise.agetty-hvc0
\ No newline at end of file
diff --git a/services/agetty-hvsi0/conf b/services/agetty-hvsi0/conf
new file mode 100644
index 0000000..ec61b5f
--- /dev/null
+++ b/services/agetty-hvsi0/conf
@@ -0,0 +1,8 @@
+GETTY_ARGS="-L"
+if [ -x /sbin/agetty -o -x /bin/agetty ]; then
+	# util-linux specific settings
+	GETTY_ARGS="${GETTY_ARGS} -8"
+fi
+
+BAUD_RATE=19200
+TERM_NAME=vt100
diff --git a/services/agetty-hvsi0/finish b/services/agetty-hvsi0/finish
new file mode 120000
index 0000000..ad464cb
--- /dev/null
+++ b/services/agetty-hvsi0/finish
@@ -0,0 +1 @@
+../agetty-generic/finish
\ No newline at end of file
diff --git a/services/agetty-hvsi0/run b/services/agetty-hvsi0/run
new file mode 120000
index 0000000..ffa62a5
--- /dev/null
+++ b/services/agetty-hvsi0/run
@@ -0,0 +1 @@
+../agetty-serial/run
\ No newline at end of file
diff --git a/services/agetty-hvsi0/supervise b/services/agetty-hvsi0/supervise
new file mode 120000
index 0000000..7dd4fb6
--- /dev/null
+++ b/services/agetty-hvsi0/supervise
@@ -0,0 +1 @@
+/run/runit/supervise.agetty-hvsi0
\ No newline at end of file