Merge branch 'carbs-init-update'

21 files changed, 32 insertions, 51 deletions

diff --git a/core/busybox-init/checksums b/core/busybox-init/checksums
index 6c6940fb..ee450bb3 100644
--- a/core/busybox-init/checksums
+++ b/core/busybox-init/checksums
@@ -1,3 +1,3 @@
 d0f940a72f648943c1f2211e0e3117387c31d765137d92bd8284a3fb9752a998  busybox-1.31.1.tar.bz2
 24d8b05873e6a59c30cf66e3387e387965fb3cc2143ebba8a0d1b92a796d5cbe  .config
-cdd4890a51a959816b6e8125f4e299d331fc5753b5df5d1f5d98252e01a341d9  inittab
+c8b3502bf493336542247683f8d291753130141e5b20ecfda7077936751e83a7  inittab
diff --git a/core/busybox-init/files/inittab b/core/busybox-init/files/inittab
index a51a9a75..62cf6cc9 100644
--- a/core/busybox-init/files/inittab
+++ b/core/busybox-init/files/inittab
@@ -1,11 +1,3 @@
 ::sysinit:/usr/lib/init/rc.boot
 ::restart:/sbin/init
 ::shutdown:/usr/lib/init/rc.shutdown
-::respawn:runsvdir -P /var/service 'log: ................................................................................................................................................................................................................................................................'
-
-tty1::respawn:/sbin/agetty 38400 tty1
-tty2::respawn:/sbin/agetty 38400 tty2
-tty3::respawn:/sbin/agetty 38400 tty3
-tty4::respawn:/sbin/agetty 38400 tty4
-tty5::respawn:/sbin/agetty 38400 tty5
-tty6::respawn:/sbin/agetty 38400 tty6
diff --git a/core/busybox-init/version b/core/busybox-init/version
index 009c2eaa..c23b9466 100644
--- a/core/busybox-init/version
+++ b/core/busybox-init/version
@@ -1 +1 @@
-1.31.1 4
+1.31.1 5
diff --git a/core/carbs-init/checksums b/core/carbs-init/checksums
index 25b4a407..252a0e8d 100644
--- a/core/carbs-init/checksums
+++ b/core/carbs-init/checksums
@@ -1 +1 @@
-aa7f11d87936e2f034a75d7ea29b68b87f460c58dee8fd92bb119ccf6d123927  init-0.5.2.tar.gz
+5c1ac69900b8e3f952b759e127b4de6bd0fecf2aa088241d5e295fef5383364d  init-0.6.1.tar.gz
diff --git a/core/carbs-init/post-install b/core/carbs-init/post-install
index ff05e78c..cc507ce3 100755
--- a/core/carbs-init/post-install
+++ b/core/carbs-init/post-install
@@ -1,7 +1,18 @@
 #!/bin/sh
 
 cat <<EOF
+!! VERY IMPORTANT !!
+    
+    Carbs-init now comes with /etc/init/getty.boot
+    and /etc/init/runit.boot
 
-NOTE: You can configure init from /etc/init/rc.conf
+    This change is to keep init systems interchangable.
+    If you are installing this package as a new package
+    (not an update) you can safely ignore the rest of
+    the message. But if you are updating, this update
+    requires a manual intervention. 
+
+    Please check the news section at https://carbslinux.org
+    before you do a reboot
 
 EOF
diff --git a/core/carbs-init/sources b/core/carbs-init/sources
index 0270fa89..e0315988 100644
--- a/core/carbs-init/sources
+++ b/core/carbs-init/sources
@@ -1 +1 @@
-http://carbslinux.org/git/archives/init/init-0.5.2.tar.gz
+http://carbslinux.org/git/archives/init/init-0.6.1.tar.gz
diff --git a/core/carbs-init/version b/core/carbs-init/version
index b6c71939..71aa2ecf 100644
--- a/core/carbs-init/version
+++ b/core/carbs-init/version
@@ -1 +1 @@
-0.5.2 1
+0.6.1 1
diff --git a/core/minit/build b/core/minit/build
index 608e17c4..c1304ed9 100755
--- a/core/minit/build
+++ b/core/minit/build
@@ -6,5 +6,4 @@ make DESTDIR="$1" PREFIX=/usr install
 ln -s minit "$1/usr/bin/init"
 
 install -Dm755 -t "$1/usr/bin" reboot poweroff
-install -Dm644 launch-services.boot "$1/etc/init/launch-services.boot"
 install -Dm644 minit.post.shutdown "$1/etc/init/minit.post.shutdown"
diff --git a/core/minit/checksums b/core/minit/checksums
index ba64d758..8b57b92b 100644
--- a/core/minit/checksums
+++ b/core/minit/checksums
@@ -1,5 +1,4 @@
 5ccf4eb8e663be2483ad469470453a7622a0f79d25d9aee8b216867c419888dd  0.1.0.tar.gz
 4da8b0c2771a9046a7ce2ded49beb5297045e9979796e5e4b390168286f05379  poweroff
 f638aaa23383da584d3a56347a8e279abdc7c9c521661ef54a5bc8b955c5632b  reboot
-3aa8642d8a1058876f3a47639640a81887298eac992bf15e41fbe420738b09ef  launch-services.boot
 4588e3c6337c1f92d3120bebd774fdcd2a85d70f150d68293527798c6e5a031d  minit.post.shutdown
diff --git a/core/minit/files/launch-services.boot b/core/minit/files/launch-services.boot
deleted file mode 100644
index 6ba14057..00000000
--- a/core/minit/files/launch-services.boot
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/core/minit/sources b/core/minit/sources
index b615bd1f..c898877a 100644
--- a/core/minit/sources
+++ b/core/minit/sources
@@ -1,5 +1,4 @@
 https://github.com/cemkeylan/minit/archive/0.1.0.tar.gz
 files/poweroff
 files/reboot
-files/launch-services.boot
 files/minit.post.shutdown
diff --git a/core/minit/version b/core/minit/version
index 6c5d3836..7d459d01 100644
--- a/core/minit/version
+++ b/core/minit/version
@@ -1 +1 @@
-0.1.0 1
+0.1.0 2
diff --git a/core/runit/checksums b/core/runit/checksums
index d77e778f..0352014f 100644
--- a/core/runit/checksums
+++ b/core/runit/checksums
@@ -1,5 +1,5 @@
 6fd0160cb0cf1207de4e66754b6d39750cff14bb0aa66ab49490992c0c47ba18  runit-2.1.2.tar.gz
-48fa11e767a19c8c7e72e4fcf6b03d7be286ccee795f11ce10577e28522b91b5  2
+95508018522e20943a88209deac334b54fad082cd4495dd0e60416641343c909  2
 4b1ca5dd082259040d34700b87e86f54f6fd0f72e3e77726b043250187d6b81d  poweroff
 b3bfe836d9e70b591ba4d510905213df7abacd3593027c54657682aaafaedb75  reboot
 56730d7443d5e531b92daebbea849278c473be6cfbd6323c2c9f2717cec05f22  clearmem.patch
diff --git a/core/runit/files/2 b/core/runit/files/2
index cae35839..b1ae818c 100755
--- a/core/runit/files/2
+++ b/core/runit/files/2
@@ -1,10 +1,5 @@
 #!/bin/sh
 
-PATH=/usr/bin:
-
-for getty in 1 2 3 4 5 6 ; do
-    while :; do /sbin/getty 38400 tty${getty} 2>&1 ; done &  # for busybox
-    # while :; do /sbin/getty /dev/tty${getty} linux 2>&1 ; done &  # for ubase
-done
+PATH=/usr/bin:/usr/sbin:/sbin:/bin
 
 exec /usr/bin/runsvdir -P /var/service
diff --git a/core/runit/post-install b/core/runit/post-install
new file mode 100755
index 00000000..806da724
--- /dev/null
+++ b/core/runit/post-install
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+cat <<EOF
+!! IMPORTANT !!
+
+    In order to use runit-init you need
+    to comment the command in 
+    /etc/init/runit.boot
+
+EOF
diff --git a/core/runit/version b/core/runit/version
index b9ac7b5d..05dbda9e 100644
--- a/core/runit/version
+++ b/core/runit/version
@@ -1 +1 @@
-2.1.2 2
+2.1.2 3
diff --git a/core/sinit/build b/core/sinit/build
index 1466e64d..e51e3f5c 100755
--- a/core/sinit/build
+++ b/core/sinit/build
@@ -9,7 +9,5 @@ ln -s sinit "$1/usr/bin/init"
 install -Dm755 poweroff "$1/usr/bin/poweroff"
 install -Dm755 reboot "$1/usr/bin/reboot"
 
-install -Dm644 sinit-launch-services.boot "$1/etc/init/sinit-launch-services.boot"
-
 # shellcheck disable=2086
 "${CC:-gcc}" -o "$1/usr/bin/kpow" init/bin/kpow.c $CFLAGS -static
diff --git a/core/sinit/checksums b/core/sinit/checksums
index 96238fd6..4fc20a8d 100644
--- a/core/sinit/checksums
+++ b/core/sinit/checksums
@@ -3,5 +3,4 @@ c334ec2395fab8e45800c97b2f032395262ea7e61adc2be2f3b59fd565c292d8  0.4.tar.gz
 6f0f1a5f2f43b5bcfd4beaa93e1a49438d398cf758d7813bc6ba86b5156357a8  config.h
 f638aaa23383da584d3a56347a8e279abdc7c9c521661ef54a5bc8b955c5632b  reboot
 4da8b0c2771a9046a7ce2ded49beb5297045e9979796e5e4b390168286f05379  poweroff
-3aa8642d8a1058876f3a47639640a81887298eac992bf15e41fbe420738b09ef  sinit-launch-services.boot
 5e2541aa672d80a8d0fcef694e4a4e74b8a0b12d415e7189228b793a4411ccd1  sinit.post.shutdown
diff --git a/core/sinit/files/sinit-launch-services.boot b/core/sinit/files/sinit-launch-services.boot
deleted file mode 100644
index 6ba14057..00000000
--- a/core/sinit/files/sinit-launch-services.boot
+++ /dev/null
@@ -1,10 +0,0 @@
-# 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/core/sinit/sources b/core/sinit/sources
index 5b8b15df..321b9e88 100644
--- a/core/sinit/sources
+++ b/core/sinit/sources
@@ -3,5 +3,4 @@ https://github.com/kisslinux/init/archive/0.4.tar.gz init
 files/config.h sinit
 files/reboot
 files/poweroff
-files/sinit-launch-services.boot
 files/sinit.post.shutdown
diff --git a/core/sinit/version b/core/sinit/version
index f8b0b375..08ad782f 100644
--- a/core/sinit/version
+++ b/core/sinit/version
@@ -1 +1 @@
-1.1 1
+1.1 2