12 Commits
1.5.2 ... 1.7.2

Author SHA1 Message Date
Alad Wenter
87de61f78c support for owner/group permissions in tmpfiles 2015-03-03 10:28:07 +03:00
fbt
22bb388fdb more robust umount 2015-03-02 18:02:16 +03:00
fbt
8af7868947 even better: configurable tpdirs and tmpfiles creation 2015-03-02 18:00:23 +03:00
fbt
e4b9660bce Merge branch 'master' of builder:git/spark-rc 2015-03-02 17:40:16 +03:00
fbt
550fabfc8e tmpfiles 2015-03-02 17:40:09 +03:00
fbt
a607a63107 Code cleanup, thx to http://www.shellcheck.net 2015-01-17 16:37:15 +03:00
fbt
782b0a3fe8 Newline, bitch 2015-01-08 15:35:06 +03:00
fbt
440eada379 simplify the default rc.conf 2015-01-08 12:42:44 +03:00
fbt
1c91d74984 support for reading hostname from /etc/hostname 2015-01-08 11:13:47 +03:00
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
2 changed files with 31 additions and 11 deletions

View File

@@ -10,7 +10,7 @@ cfg_hostname='changeme'
# Services
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+=( '@lo.iface' ) # These start in parallel.
cfg_services+=( @agetty-tty{2..6} ) # Comment this if your init starts something on the ttys itself.
cfg_services+=( 'rc.local' ) # Traditionally, rc.local starts last. Technically here it doesn't. Not quite :)

30
rc.in
View File

@@ -11,23 +11,40 @@ cfg_mounts+=( 'pts:devpts:/dev/pts:noexec,nosuid,gid=5,mode=0620' )
cfg_mounts+=( 'mqueue:mqueue:/dev/mqueue:noexec,nosuid,nodev' )
cfg_mounts+=( 'shm:tmpfs:/dev/shm:defaults,mode=0777' )
# Some temporary directories
cfg_tmpdirs+=( '/run/lock' '/run/lock/lvm' '/run/lvm' '/run/user' )
# And temporary files
cfg_tmpfiles+=( '/run/utmp' )
# Functions
rc.rescue() { exec "${cfg_rc_rescue_shell:-"$SHELL"}"; }
rc.motd() {
[[ -f "/etc/rc.motd" ]] && {
while read; do
printf "$REPLY"
printf "%s\n" "$REPLY"
done < "/etc/rc.motd"
}
return 0
}
rc.tmpfiles() {
printf '%s\n' "${cfg_tmpdirs[@]}" | while IFS=':' read dir perm own grp; do
install -v -d -m "${perm:-755}" -o "${own:-root}" -g "${grp:-root}" "$dir" 2>/dev/null
done
printf '%s\n' "${cfg_tmpfiles[@]}" | while IFS=':' read file perm own grp; do
> "$file"
chmod -c "${perm:-644}" "$file"
chown -c "${own:-root}:${grp:-root}" "$file"
done
}
rc.mount_misc() {
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'; }
mountpoint -q "$mountpoint" || {
@@ -35,6 +52,7 @@ rc.mount_misc() {
mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
}
done
done
}
rc.parse_cmdline() {
@@ -97,7 +115,7 @@ rc.stop_everything() {
rc.unmount_everything() {
echo "Unmounting filesystems..."
umount -a
umount -r -a
}
rc.remount_root() {
@@ -107,6 +125,7 @@ rc.remount_root() {
rc.boot() {
rc.mount_misc
rc.tmpfiles
rc.hostname
rc.timezone
rc.modules
@@ -135,6 +154,7 @@ rc.shutdown() {
}
rc.hostname() {
[[ -f '/etc/hostname' ]] && { hostname "$(</etc/hostname)"; }
[[ "$cfg_hostname" ]] && { hostname "$cfg_hostname"; }
}
@@ -157,7 +177,7 @@ rc.main() {
case "$action" in
boot)
echo "Welcome to `uname -rs`"
echo "Welcome to $(uname -rs)"
rc.boot
;;