sinit: build without depending on ubase (#276)

cemkeylan · web-flow · commit f687a7a557a1 · 2020-02-07T01:54:54.000+02:00
* sinit: build with ubase instead of depending on it * remove leftover vim command * remove newline * sinit: cover with braces * sinit: comment ubase in the same function * sinit: add getty comments on the same line as the command itself * sinit: remove duplicate command * sinit: remove respawn, fix indentations, use infinite loop * sinit: shorten case function * add config.h to sinit * sinit: don't edit user configuration, add to the note * sinit: use kpow for the shutdown hook * sinit: remove post shutdown hook * sinit: fix build and remove ubase. Resolves #273 * sinit: link init to the sinit on the current directory * sinit: simplify launching services * sinit: change post-install message * sinit: change messages
diff --git a/community/sinit/build b/community/sinit/build
@@ -1,10 +1,9 @@
 #!/bin/sh -e
 
-make CFLAGS="$CFLAGS -static"
+make CFLAGS="$CFLAGS -static" PREFIX=/usr DESTDIR="$1" install
+ln -s sinit "$1/usr/bin/init"
 
-install -Dm 755 sinit "$1/usr/bin/sinit"
+install -Dm755 poweroff "$1/usr/bin/poweroff"
+install -Dm755 reboot "$1/usr/bin/reboot"
 
-install -Dm 755 sinit.runit.boot "$1/etc/rc.d/sinit.runit.boot"
-install -Dm 755 sinit.getty.boot "$1/etc/rc.d/sinit.getty.boot"
-install -Dm 755 sinit.pre.shutdown "$1/etc/rc.d/sinit.pre.shutdown"
-install -Dm 755 sinit.post.shutdown "$1/etc/rc.d/sinit.post.shutdown"
+install -Dm644 sinit-launch-services.boot "$1/etc/rc.d/sinit-launch-services.boot"
diff --git a/community/sinit/checksums b/community/sinit/checksums
@@ -1,6 +1,5 @@
 78c2120a97a5e93b80606c5403bd731152f8a344e47aa4ab74970c1c11dc6fc0  sinit-1.0.tar.gz
-aa9462fd25447d169470def3bfe51d429b32db3efba2825779717f791ca12a56  config.def.h
-5d7c393e4f6b17bbe778a28a8d5a89317e6f86de16b476cf066f9d6e004497fc  sinit.getty.boot
-64019ee1c9c1348e0dcce13496d96bfdf68e4f22a362c0c1ee96c9dcebe0e862  sinit.runit.boot
-ba33d1e788765db6f1ecd43fc3cf9c7330f6f78986c55ffec4524d8b8414878c  sinit.pre.shutdown
-41fe50f31ffdb168ea1f60232347867750c31cf07e171e3d6648911e1b672c1e  sinit.post.shutdown
+6f0f1a5f2f43b5bcfd4beaa93e1a49438d398cf758d7813bc6ba86b5156357a8  config.h
+f638aaa23383da584d3a56347a8e279abdc7c9c521661ef54a5bc8b955c5632b  reboot
+4da8b0c2771a9046a7ce2ded49beb5297045e9979796e5e4b390168286f05379  poweroff
+3aa8642d8a1058876f3a47639640a81887298eac992bf15e41fbe420738b09ef  sinit-launch-services.boot
diff --git a/community/sinit/depends b/community/sinit/depends
@@ -1,2 +1 @@
 baseinit
-ubase
diff --git a/community/sinit/files/config.def.h b/community/sinit/files/config.def.h
diff --git a/community/sinit/files/config.h b/community/sinit/files/config.h
@@ -0,0 +1,3 @@
+static char *const rcinitcmd[]     = { "/usr/lib/init/rc.boot", NULL };
+static char *const rcrebootcmd[]   = { "/usr/lib/init/rc.shutdown", "reboot", NULL };
+static char *const rcpoweroffcmd[] = { "/usr/lib/init/rc.shutdown", "poweroff", NULL };
diff --git a/community/sinit/files/etc/rc.d/sinit.getty.boot b/community/sinit/files/etc/rc.d/sinit.getty.boot
diff --git a/community/sinit/files/etc/rc.d/sinit.post.shutdown b/community/sinit/files/etc/rc.d/sinit.post.shutdown
diff --git a/community/sinit/files/etc/rc.d/sinit.pre.shutdown b/community/sinit/files/etc/rc.d/sinit.pre.shutdown
diff --git a/community/sinit/files/etc/rc.d/sinit.runit.boot b/community/sinit/files/etc/rc.d/sinit.runit.boot
diff --git a/community/sinit/files/poweroff b/community/sinit/files/poweroff
@@ -0,0 +1,2 @@
+#!/bin/sh
+/bin/kill -s USR1 1
diff --git a/community/sinit/files/reboot b/community/sinit/files/reboot
@@ -0,0 +1,2 @@
+#!/bin/sh
+/bin/kill -s INT 1
diff --git a/community/sinit/files/sinit-launch-services.boot b/community/sinit/files/sinit-launch-services.boot
@@ -0,0 +1,10 @@
+# We are going to start runit and getty here
+
+# Uncomment to enable gettys
+# for getty in 1 2 3 4 5 6 ; do
+#     while :; do /sbin/getty tty${getty} 0 linux ; done &  # busybox getty
+# #    while :; do /sbin/getty tty${getty} linux ; done &   # ubase getty
+# done
+
+# Uncomment enable runit services
+# while :; do /usr/bin/runsvdir -P /var/service ; done &
diff --git a/community/sinit/post-install b/community/sinit/post-install
@@ -2,32 +2,24 @@
 
 cat <<EOF
 
-IMPORTANT:
-        This package is installed as /usr/bin/sinit
-        Please update your kernel parameters
-        accordingly,
+!! IMPORTANT !!
 
-        -> init=/usr/bin/sinit
+To start using sinit, edit
+/etc/rc.d/sinit-launch-services.boot
+And uncomment the getty function, and
+Optionally uncomment the runit function
+If you deem necessary.
 
-        Please keep in mind that sinit does not use
-        the /etc/inittab file. The default busybox
-        runit service supervisor may (optionally)
-        still be initialized.
+sinit is installed as /usr/bin/sinit. It
+can fully replace busybox init by running
+the following command.
 
-        The following options should be added to
-        /etc/rc.conf:
+      kiss a | grep ^sinit | kiss a -
 
-        -> SINIT_ENABLE_SHUTDOWN_HOOKS=1   # <- (required)
-        -> SINIT_ENABLE_GETTY=1            # <- (required)
-        -> SINIT_ENABLE_RUNIT=1            # <- (optional)
-
-USAGE:
-        To shutdown:
-
-        -> # kill -s USR1 1
-
-        To reboot:
-
-        -> # kill -s INT 1
+NOTE: If swapping from busybox init on a 
+      running system, shutdown/reboot by 
+      invoking 'busybox poweroff'. sinit's 
+      poweroff/reboot utilities can't be of
+      use until it is actually running.
 
 EOF
diff --git a/community/sinit/sources b/community/sinit/sources
@@ -1,6 +1,5 @@
 https://dl.suckless.org/sinit/sinit-1.0.tar.gz
-files/config.def.h
-files/etc/rc.d/sinit.getty.boot
-files/etc/rc.d/sinit.runit.boot
-files/etc/rc.d/sinit.pre.shutdown
-files/etc/rc.d/sinit.post.shutdown
+files/config.h
+files/reboot
+files/poweroff
+files/sinit-launch-services.boot
diff --git a/community/sinit/version b/community/sinit/version
@@ -1 +1 @@
-1.0 1
+1.0 2

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+static char *const rcinitcmd[] = { "/usr/lib/init/rc.boot", NULL };`
	`2`	`+static char *const rcrebootcmd[] = { "/usr/lib/init/rc.shutdown", "reboot", NULL };`
	`3`	`+static char *const rcpoweroffcmd[] = { "/usr/lib/init/rc.shutdown", "poweroff", NULL };`