diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-03-21 23:14:53 +0100 |
|---|---|---|
| committer | Juan RP <xtraeme@gmail.com> | 2015-03-22 07:09:18 +0100 |
| commit | 94e5820c674a619cc0b206a5e4f24e30c7910c8e (patch) | |
| tree | b15c487ca50da6d1e5b8e07250165087e9ce7856 /core-services | |
| parent | 22d922a8d2cf0c81e85c18b7709487e41cbb6c4d (diff) | |
| download | runit-void-94e5820c674a619cc0b206a5e4f24e30c7910c8e.tar.gz runit-void-94e5820c674a619cc0b206a5e4f24e30c7910c8e.tar.xz runit-void-94e5820c674a619cc0b206a5e4f24e30c7910c8e.zip | |
add a newline by default to msg and msg_warn output
Diffstat (limited to 'core-services')
| -rw-r--r-- | core-services/03-filesystems.sh | 18 | ||||
| -rw-r--r-- | core-services/05-misc.sh | 10 |
2 files changed, 14 insertions, 14 deletions
diff --git a/core-services/03-filesystems.sh b/core-services/03-filesystems.sh index 8b1e16b..01c4fe4 100644 --- a/core-services/03-filesystems.sh +++ b/core-services/03-filesystems.sh @@ -2,30 +2,30 @@ [ -n "$VIRTUALIZATION" ] && return 0 -msg "Remounting rootfs read-only...\n" +msg "Remounting rootfs read-only..." mount -o remount,ro / || emergency_shell if [ -x /sbin/dmraid ]; then - msg "Activating dmraid devices...\n" + msg "Activating dmraid devices..." dmraid -i -ay fi if [ -x /bin/btrfs ]; then - msg "Activating btrfs devices...\n" + msg "Activating btrfs devices..." btrfs device scan || emergency_shell fi if [ -x /sbin/vgchange ]; then - msg "Activating LVM devices...\n" + msg "Activating LVM devices..." vgchange --sysinit -a y || emergency_shell fi if [ -e /etc/crypttab ]; then - msg "Activating encrypted devices...\n" + msg "Activating encrypted devices..." awk -f /etc/runit/crypt.awk /etc/crypttab if [ -x /sbin/vgchange ]; then - msg "Activating LVM devices for dm-crypt...\n" + msg "Activating LVM devices for dm-crypt..." vgchange --sysinit -a y || emergency_shell fi fi @@ -40,15 +40,15 @@ for arg in $(cat /proc/cmdline); do done if [ -z "$FASTBOOT" ]; then - msg "Checking filesystems:\n" + msg "Checking filesystems:" fsck -A -T -a -t noopts=_netdev $FORCEFSCK if [ $? -gt 1 ]; then emergency_shell fi fi -msg "Mounting rootfs read-write...\n" +msg "Mounting rootfs read-write..." mount -o remount,rw / || emergency_shell -msg "Mounting all non-network filesystems...\n" +msg "Mounting all non-network filesystems..." mount -a -t "nosysfs,nonfs,nonfs4,nosmbfs,nocifs" -O no_netdev || emergency_shell diff --git a/core-services/05-misc.sh b/core-services/05-misc.sh index 27cb235..db1bf34 100644 --- a/core-services/05-misc.sh +++ b/core-services/05-misc.sh @@ -1,21 +1,21 @@ # vim: set ts=4 sw=4 et: -msg "Initializing random seed...\n" +msg "Initializing random seed..." cp /var/lib/random-seed /dev/urandom >/dev/null 2>&1 || true ( umask 077; dd if=/dev/urandom of=/var/lib/random-seed count=1 bs=512 >/dev/null 2>&1 ) -msg "Setting up loopback interface...\n" +msg "Setting up loopback interface..." ip link set up dev lo [ -r /etc/hostname ] && read -r HOSTNAME < /etc/hostname if [ -n "$HOSTNAME" ]; then - msg "Setting up hostname to '${HOSTNAME}'...\n" + msg "Setting up hostname to '${HOSTNAME}'..." echo "$HOSTNAME" > /proc/sys/kernel/hostname else - msg_warn "Didn't setup a hostname!\n" + msg_warn "Didn't setup a hostname!" fi if [ -n "$TIMEZONE" ]; then - msg "Setting up timezone to '${TIMEZONE}'...\n" + msg "Setting up timezone to '${TIMEZONE}'..." ln -sf "/usr/share/zoneinfo/$TIMEZONE" /etc/localtime fi |