From e4eeebc9a613b18c2b6d6d6c4c848d22db33df99 Mon Sep 17 00:00:00 2001
From: Cem Keylan <cem@ckyln.com>
Date: Fri, 23 Jul 2021 18:45:30 +0300
Subject: baselayout: use clinst, remove install-sv

---
 core/baselayout/build            | 15 ++++-----------
 core/baselayout/checksums        |  1 -
 core/baselayout/depends          |  1 +
 core/baselayout/files/install-sv | 34 ----------------------------------
 core/baselayout/sources          |  1 -
 core/baselayout/version          |  2 +-
 6 files changed, 6 insertions(+), 48 deletions(-)
 create mode 100644 core/baselayout/depends
 delete mode 100755 core/baselayout/files/install-sv

(limited to 'core/baselayout')

diff --git a/core/baselayout/build b/core/baselayout/build
index d55a8d0f..b194829d 100755
--- a/core/baselayout/build
+++ b/core/baselayout/build
@@ -5,12 +5,6 @@
 # The fallback is for backwards compatibility, this will be dropped later.
 sys_arch=${3:-$(uname -m)}
 
-kinstall_t() {
-    mod=$1 dir=$2; mkdir -p "$2"
-    shift 2
-    for file do cp "$file" "$dir"; chmod "$mod" "$file"; done
-}
-
 # Setup base directories.
 for d in boot dev etc home mnt usr var opt run; do
     mkdir -pm 755 "$1/$d"
@@ -66,10 +60,9 @@ done
 ln -s ../man "$1/usr/local/share/man"
 
 # /etc skeleton files.
-kinstall_t 644 "$1/etc" fstab group host.conf hosts issue keymap os-release \
-                        passwd profile securetty shells mime.types
-kinstall_t 600 "$1/etc" crypttab shadow
-
-kinstall_t 755 "$1/usr/bin" install-sv
+clinst -Dm644 -t "$1/etc"
+clinst -Dm644 -t "$1/etc" fstab group host.conf hosts issue keymap os-release \
+                          passwd profile securetty shells mime.types
+clinst -Dm600 -t "$1/etc" crypttab shadow
 
 ln -s /proc/self/mounts "$1/etc/mtab"
diff --git a/core/baselayout/checksums b/core/baselayout/checksums
index b4b4e3d2..9a7938d6 100644
--- a/core/baselayout/checksums
+++ b/core/baselayout/checksums
@@ -1,5 +1,4 @@
 3698c87cc3af757f0302f6d7f034350b1b22a7f25b2f71944292d0fb3de67cd7  crypttab
-898834c6adcadd039e56b7c362ae357a54166a7c01348c6413a4117e662e4605  install-sv
 f85cb0b07f49ff20c4838c267ffb093a136fb5bfdf01badcb03eced852ffea89  fstab
 38c9f4047ba597248ef199a77afbd36f873cfa4aeb70de90bac7f237faf2ecba  group
 a0fa9cd303cf7f1718f51e5624a671a418946718b790508b8988bccd542c6451  host.conf
diff --git a/core/baselayout/depends b/core/baselayout/depends
new file mode 100644
index 00000000..8af0cc64
--- /dev/null
+++ b/core/baselayout/depends
@@ -0,0 +1 @@
+clinst
diff --git a/core/baselayout/files/install-sv b/core/baselayout/files/install-sv
deleted file mode 100755
index 509b2516..00000000
--- a/core/baselayout/files/install-sv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh -e
-# Carbs Linux service installer
-
-usage() {
-    printf '%s\n' \
-        "usage: ${0##*/} [FILE...]" \
-        "or:    ${0##*/} [-a NAME FILE]" "" \
-        "You can set the DESTDIR environment variable to set a different root."
-    exit 1
-}
-
-svname=''
-case "$1" in
-    --help|-h|'') usage ;;
-    -a) [ "$#" -eq 3 ] || usage
-        svname=$2; shift 2
-esac
-
-for service; do
-    # Remove .run suffix and the directory name for service files.
-    sv=${svname:-${service%.run}} sv=${sv##*/}
-
-    # Create the service directories and copy the service file to them.
-    mkdir -p "$DESTDIR/etc/sysmgr" "$DESTDIR/etc/sv/$sv"
-    cp "$service" "$DESTDIR/etc/sysmgr/$sv"
-    cp "$service" "$DESTDIR/etc/sv/$sv/run"
-
-    # Set permissions for the services.
-    chmod 0755 "$DESTDIR/etc/sysmgr/$sv" "$DESTDIR/etc/sv/$sv/run"
-
-    # Create supervise directories for runit.
-    ln -s "/run/runit/supervise.$sv" "$DESTDIR/etc/sv/$sv/supervise"
-
-done
diff --git a/core/baselayout/sources b/core/baselayout/sources
index 44f9434f..a663d479 100644
--- a/core/baselayout/sources
+++ b/core/baselayout/sources
@@ -1,5 +1,4 @@
 files/crypttab
-files/install-sv
 files/fstab
 files/group
 files/host.conf
diff --git a/core/baselayout/version b/core/baselayout/version
index cba3471e..606c19ac 100644
--- a/core/baselayout/version
+++ b/core/baselayout/version
@@ -1 +1 @@
-2 1
+3 1
-- 
cgit v1.2.3