4 Commits
1.5.1 ... 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
3 changed files with 17 additions and 7 deletions

View File

@@ -25,6 +25,7 @@ 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 install -m755 tools/killall5 $(BINDIR)/killall5

22
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,16 +27,20 @@ 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" || {
[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; }
mountpoint -q "$mountpoint" || { mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint"
[[ -d "$mountpoint" ]] || { mkdir -p "$mountpoint"; } }
mount "$fs" -n -t "$fs_type" -o "$mount_options" "$mountpoint" done
}
done done
} }
@@ -107,6 +114,7 @@ rc.remount_root() {
rc.boot() { rc.boot() {
rc.mount_misc rc.mount_misc
rc.tmpdirs
rc.hostname rc.hostname
rc.timezone rc.timezone
rc.modules rc.modules

1
rc.motd Normal file
View File

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