commit a7e807e68df4e92332ab83ce8b8dbe2236cce080
parent aacabbe88edc410207d52b1b31c4d33359fd849a
Author: Jan Pobříslo <ccx@te2000.cz>
Date: Mon, 7 Nov 2022 23:15:35 +0100
Remove superfluous skel directory.
Diffstat:
6 files changed, 1 insertion(+), 95 deletions(-)
diff --git a/install b/install
@@ -8,7 +8,7 @@ test -d "$sm_dst_package" || exit 1
cmd=$sm_dst_package/command
src=$("$cmd/s6-dirname" "$0")
-test -d "$src/skel" || exit 1
+test -d "$src/run-image/service/.s6-svscan" || exit 1
q() {
"$sm_dst_package/command/s6-quote" "$@"
diff --git a/skel/.keep b/skel/.keep
diff --git a/skel/rc.init b/skel/rc.init
@@ -1,49 +0,0 @@
-#!/bin/sh -e
-
-rl="$1"
-shift
-
-### argv now contains the arguments of the kernel command line that are
-### not of the form key=value. (The key=value arguments were stored by
-### s6-linux-init into an envdir, if instructed so via the -s option.)
-### Normally this argv remains unused because programs that need the
-### kernel command line usually read it later on from /proc/cmdline -
-### but just in case, it's available here.
-
-
-### 1. Early preparation
-### This is done only once at boot time.
-### Ideally, this phase should just initialize the service manager.
-
-### If your services are managed by sysv-rc:
-# /etc/init.d/rcS
-
-### If your services are managed by OpenRC:
-# /sbin/openrc sysinit
-# /sbin/openrc boot
-
-### If your services are managed by s6-rc:
-### (replace /run/service with your scandir)
-# s6-rc-init /run/service
-
-
-### 2. Starting the wanted set of services
-### This is also called every time you change runlevels with telinit.
-### (edit the location to suit your installation)
-### By default, $rl is the string "default", unless you changed it
-### via the -D option to s6-linux-init-maker.
-### Numeric arguments from 1 to 5 on the kernel command line will
-### override the default.
-
-# exec /etc/s6-linux-init/current/scripts/runlevel "$rl"
-
-
-### If this script is run in a container, then 1. and 2. above do not
-### apply and you should just call your CMD, if any, or let your
-### services run.
-### Something like this:
-
-# if test -z "$*" ; then return 0 ; fi
-# $@
-# echo $? > /run/s6-linux-init-container-results/exitcode
-# halt
diff --git a/skel/rc.shutdown b/skel/rc.shutdown
@@ -1,9 +0,0 @@
-#!/command/execlineb -P
-
-### Things to do before hardware halt/reboot/poweroff.
-### Ideally, it should be a single call to the service manager,
-### telling it to bring all the services down.
-
-redirfd -w 1 /dev/console
-redirfd -w 2 /dev/console
-s6-rc -v2 -bDa change
diff --git a/skel/rc.shutdown.final b/skel/rc.shutdown.final
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-### Things to do *right before* the machine gets rebooted or
-### powered off, at the very end of the shutdown sequence,
-### when all the filesystems are unmounted.
-
-### This is a last resort hook; normally nothing should be
-### done here (your rc.shutdown script should have taken care
-### of everything) and you should leave this script empty.
-
-### Some distributions, however, may need to perform some
-### actions after unmounting the filesystems: typically if
-### an additional teardown action is required on a filesystem
-### after unmounting it, or if the system needs to be
-### pivot_rooted before it can be shut down, etc.
-
-### Those are all exceptional cases. If you don't know for
-### certain that you need to do something here, you don't.
diff --git a/skel/runlevel b/skel/runlevel
@@ -1,18 +0,0 @@
-#!/bin/sh -e
-
-### This script is called once at boot time by rc.init, and is
-### also called by the runleveld service every time the user
-### requests a machine state change via telinit.
-### Ideally, it should just be a call to the service manager.
-
-test "$#" -gt 0 || { echo 'runlevel: fatal: too few arguments' 1>&2 ; exit 100 ; }
-
-
-### If your services are managed by sysv-rc:
-# exec /etc/init.d/rc "$1"
-
-### If your services are managed by OpenRC:
-# exec /sbin/openrc "$1"
-
-### If your services are managed by s6-rc:
-# exec s6-rc -v2 -up change "$1"
