8 Commits

6 changed files with 25 additions and 12 deletions

View File

@@ -156,7 +156,7 @@ in_array() {
print_welcome() { print_welcome() {
# see os-release(5) # see os-release(5)
. /etc/os-release . /usr/lib/os-release
echo " " echo " "
printhl "${PRETTY_NAME}\n" printhl "${PRETTY_NAME}\n"

View File

@@ -6,14 +6,15 @@
config(){ config(){
[ -r /etc/vconsole.conf ] && . /etc/vconsole.conf [ -r /etc/vconsole.conf ] && . /etc/vconsole.conf
TTYS=${TTYS:-6} TTYS=${TTYS:-6}
if [ -n "$FONT" ]; then _index=0
_index=0 while [ ${_index} -le $TTYS ]; do
while [ ${_index} -le $TTYS ]; do if [ -n "$FONT" ]; then
setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} \ setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} \
$FONT -C "/dev/tty${_index}" $FONT -C "/dev/tty${_index}"
_index=$((_index + 1)) fi
done printf "\033%s" "%G" >/dev/tty${_index}
fi _index=$((_index + 1))
done
if [ -n "$KEYMAP" ]; then if [ -n "$KEYMAP" ]; then
loadkeys -q -u ${KEYMAP} loadkeys -q -u ${KEYMAP}
fi fi

View File

@@ -13,11 +13,13 @@ esac
case "$1" in case "$1" in
start) start)
stat_busy "Adjusting hwclock"
hwclock $HWCLOCK_PARAMS || stat_die hwclock $HWCLOCK_PARAMS || stat_die
add_daemon hwclock add_daemon hwclock
stat_done stat_done
;; ;;
stop) stop)
stat_busy "Adjusting hwclock"
hwclock --adjust $HWCLOCK_PARAMS || stat_die hwclock --adjust $HWCLOCK_PARAMS || stat_die
rm_daemon hwclock rm_daemon hwclock
stat_done stat_done

View File

@@ -69,6 +69,11 @@ kill_all(){
case "$1" in case "$1" in
start) start)
if [[ -x "/bin/btrfs" ]]; then
stat_busy "Activating btrfs devices"
btrfs device scan
stat_done
fi
stat_busy "Checking filesystems" stat_busy "Checking filesystems"
do_fsck do_fsck
add_daemon misc add_daemon misc

View File

@@ -45,7 +45,7 @@ umount_fs() {
case "$1" in case "$1" in
start) start)
stat_busy "Mounting filesystema" stat_busy "Mounting filesystems"
mount_fs || stat_die root mount_fs || stat_die root
add_daemon root add_daemon root
stat_done root stat_done root

View File

@@ -5,10 +5,15 @@
case "$1" in case "$1" in
start) start)
stat_busy "Starting udev daemon" # check if runit already runs udevd
udevd --daemon || stat_die udev if ! pgrep -f "runsv udevd" >/dev/null 2>&1; then
add_daemon udev stat_busy "Starting udev daemon"
stat_done udev udevd --daemon || stat_die udev
# Note: This is only needed for initialization, udev will
# be controlled by runit on stage 2.
add_daemon udev
stat_done udev
fi
;; ;;
stop) stop)
stat_busy "Stopping udev" stat_busy "Stopping udev"