15 Commits
1.3.2 ... 1.5.4

Author SHA1 Message Date
fbt
31f80cc8da avoid heredocs, they don't work on a fully readonly VFS 2015-01-05 22:32:29 +03:00
fbt
f3cc18fcc2 Merge branch 'master' of builder:git/spark-rc 2014-12-30 18:41:33 +03:00
fbt
c23f30e7ca tmpdirs 2014-12-30 18:41:24 +03:00
fbt
14e07dbedf motd 2014-12-27 18:28:34 +03:00
fbt
88f0fa6acb Merge branch 'master' of builder:git/spark-rc 2014-12-27 17:53:39 +03:00
fbt
1d0bc30bb2 fixed the default rc.conf a bit 2014-12-27 17:53:28 +03:00
fbt
158c5939fd useless function 2014-12-01 12:03:31 +03:00
fbt
9edb1380fb rc.conf example for the timezone 2014-11-07 00:09:34 +03:00
fbt
f65b360295 set the timezone from rc.conf 2014-11-07 00:08:55 +03:00
fbt
362571f19a halt action 2014-11-06 23:29:40 +03:00
fbt
1c52234809 this is not the watchman makefile 2014-10-18 17:57:36 +04:00
fbt
025d3e4a36 make install 2014-10-18 17:56:51 +04:00
fbt
834668bd87 killall5 2014-10-18 17:50:53 +04:00
fbt
8a36bb37ae license 2014-10-16 13:28:18 +04:00
fbt
93edc4ceb7 This works properly 2014-08-09 15:17:26 +04:00
7 changed files with 104 additions and 17 deletions

13
LICENSE Normal file
View File

@@ -0,0 +1,13 @@
Copyright (c) 2012-2014, Jack L. Frost <fbt@fleshless.org>
Permission to use, copy, modify, and/or distribute this software for any purpose with or without
fee is hereby granted, provided that the above copyright notice and this permission notice appear
in all copies.
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS
SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
OF THIS SOFTWARE.

View File

@@ -1,5 +1,4 @@
# watchman makefile # spark-rc makefile
VERSION=1.6.9
# Please modify config.mk and not this # Please modify config.mk and not this
sinclude config.mk sinclude config.mk
@@ -26,6 +25,9 @@ install: build
install -m750 rc $(BINDIR)/rc install -m750 rc $(BINDIR)/rc
install -m644 rc.conf $(ETCDIR)/rc.conf install -m644 rc.conf $(ETCDIR)/rc.conf
install -m644 rc.motd $(ETCDIR)/rc.motd
install -m755 tools/killall5 $(BINDIR)/killall5
uninstall: uninstall:
rm $(BINDIR)/rc rm $(BINDIR)/rc

View File

@@ -2,7 +2,7 @@
USR ?= /usr/local USR ?= /usr/local
ETC ?= /etc ETC ?= /etc
PREFIX ?= / BIN ?= $(USR)/bin
BINDIR = $(DESTDIR)$(PREFIX)/$(USR)/bin BINDIR = $(DESTDIR)$(PREFIX)$(BIN)
ETCDIR = $(DESTDIR)$(PREFIX)/$(ETC) ETCDIR = $(DESTDIR)$(PREFIX)$(ETC)

12
rc.conf
View File

@@ -4,14 +4,18 @@ export PATH='/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin'
# Hostname # Hostname
cfg_hostname='changeme' cfg_hostname='changeme'
# Timezone
# Change this to yours
#cfg_timezone='Europe/Moscow'
# Services # Services
cfg_services+=( 'fsck' 'mount' 'systemd-udevd' 'sysctl' ) # Services that need tp be started in an order cfg_services+=( 'fsck' 'mount' 'systemd-udevd' 'sysctl' ) # Services that need tp be started in an order
cfg_services+=( '@lo.iface' '@crond' '@dbus' '@alsa' ) # These start in parallel.
cfg_services+=( @agetty-tty{2..6} ) # Comment this if your init starts something on the ttys itself. cfg_services+=( @agetty-tty{2..6} ) # Comment this if your init starts something on the ttys itself.
cfg_services+=( '@crond' '@network' '@dbus' '@alsa' ) # These start in parallel. cfg_services+=( 'rc.local' ) # Traditionally, rc.local starts last. Technically here it doesn't. Not quite :)
cfg_services+=( 'rc.local' ) # Traditionally, rc.local starts last.
# Modules # Add modules you want to be loaded at boot time here
cfg_modules=( ) # Add modules you want to be loaded at boot time here #cfg_modules=( )
# Make C-A-D perform a soft reset # Make C-A-D perform a soft reset
ctrlaltdel soft ctrlaltdel soft

21
rc.in
View File

@@ -11,6 +11,9 @@ cfg_mounts+=( 'pts:devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620' )
cfg_mounts+=( 'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev' ) cfg_mounts+=( 'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev' )
cfg_mounts+=( 'shm:tmpfs:/dev/shm:defaults,mode=0777' ) cfg_mounts+=( 'shm:tmpfs:/dev/shm:defaults,mode=0777' )
# Some temporary directories
cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
# Functions # Functions
rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; } rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
@@ -24,10 +27,13 @@ rc.motd() {
return 0 return 0
} }
rc.tmpdirs() {
mkdir -p -m0755 "${cfg_tmpdirs[@]}"
}
rc.mount_misc() { rc.mount_misc() {
for m in "${cfg_mounts[@]}"; do for m in "${cfg_mounts[@]}"; do
IFS=':' read fs fs_type mountpoint mount_options <<< "$m" echo "$m" | while IFS=':' read fs fs_type mountpoint mount_options; do
[[ "$mount_options" ]] || { mount_options='defaults'; } [[ "$mount_options" ]] || { mount_options='defaults'; }
mountpoint -q "$mountpoint" || { mountpoint -q "$mountpoint" || {
@@ -35,6 +41,7 @@ rc.mount_misc() {
mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint" mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
} }
done done
done
} }
rc.parse_cmdline() { rc.parse_cmdline() {
@@ -107,7 +114,9 @@ rc.remount_root() {
rc.boot() { rc.boot() {
rc.mount_misc rc.mount_misc
rc.tmpdirs
rc.hostname rc.hostname
rc.timezone
rc.modules rc.modules
rc.services_start rc.services_start
wait wait
@@ -143,6 +152,12 @@ rc.modules() {
done done
} }
rc.timezone() {
[[ "$cfg_timezone" ]] && {
ln -fs "/usr/share/zoneinfo/${cfg_timezone}" /etc/localtime
}
}
rc.main() { rc.main() {
source "@ETC@/rc.conf" source "@ETC@/rc.conf"
@@ -154,7 +169,7 @@ rc.main() {
rc.boot rc.boot
;; ;;
poweroff|reboot|shutdown) poweroff|reboot|shutdown|halt)
rc.shutdown rc.shutdown
;; ;;
esac esac

1
rc.motd Normal file
View File

@@ -0,0 +1 @@
Boot finished. Switch to tty2 to login.

52
tools/killall5 Executable file
View File

@@ -0,0 +1,52 @@
#!/usr/bin/env bash
# A simple reimplementation of killall5 from sysvinit-tools
get_my_tree() {
local my_pid
read my_pid garbage < "/proc/self/stat"
child="$my_pid"
while [[ "$parent" != 1 ]]; do
read a b c parent d < "/proc/$child/stat";
child="$parent"
echo "$parent"
done
}
get_all_procs() {
local processlist
for i in /proc/*/exe; do
process_dir="${i%/*}"
process_pid="${process_dir##*/}"
readlink -e "$i" &>/dev/null && {
echo "$process_pid"
}
done
}
get_procs_to_kill() {
for i in "${all_procs[@]}"; do
unset skip
for p in "${my_tree[@]}"; do
[[ "$i" == "$p" ]] && { skip=1; }
done
[[ "$skip" ]] || { echo "$i"; }
done
}
main() {
my_tree=( $(get_my_tree) self thread-self )
all_procs=( $(get_all_procs) )
procs_to_kill=( $(get_procs_to_kill) )
signal="${1:-"-15"}"
kill "$signal" "${procs_to_kill[@]}" 2>/dev/null
return 0
}
main "$@"