From 072c64d208f86934f13d1c81d3e0da91fc64ccb5 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Sun, 22 Mar 2015 07:19:13 +0100 Subject: core-services: remove extra newline from msg{,_warn}(). --- core-services/00-pseudofs.sh | 2 +- core-services/02-console-setup.sh | 6 +++--- core-services/02-udev.sh | 4 ++-- core-services/04-swap.sh | 2 +- core-services/07-kmods.sh | 2 +- core-services/08-sysctl.sh | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) (limited to 'core-services') diff --git a/core-services/00-pseudofs.sh b/core-services/00-pseudofs.sh index 5d72950..7f23f13 100644 --- a/core-services/00-pseudofs.sh +++ b/core-services/00-pseudofs.sh @@ -1,6 +1,6 @@ # vim: set ts=4 sw=4 et: -msg "Mounting pseudo-filesystems...\n" +msg "Mounting pseudo-filesystems..." mountpoint -q /proc || mount -o nosuid,noexec,nodev -t proc proc /proc mountpoint -q /sys || mount -o nosuid,noexec,nodev -t sysfs sys /sys mountpoint -q /run || mount -o mode=0755,nosuid,nodev -t tmpfs run /run diff --git a/core-services/02-console-setup.sh b/core-services/02-console-setup.sh index 5769f61..f1a4afc 100644 --- a/core-services/02-console-setup.sh +++ b/core-services/02-console-setup.sh @@ -3,19 +3,19 @@ [ -n "$VIRTUALIZATION" ] && return 0 if [ -n "$FONT" ]; then - msg "Setting up TTYs font to '${FONT}'...\n" + msg "Setting up TTYs font to '${FONT}'..." for i in /dev/tty[0-6]; do setfont ${FONT_MAP:+-m $FONT_MAP} ${FONT_UNIMAP:+-u $FONT_UNIMAP} $FONT -C $i done fi if [ -n "$KEYMAP" ]; then - msg "Setting up keymap to '${KEYMAP}'...\n" + msg "Setting up keymap to '${KEYMAP}'..." loadkeys -q -u ${KEYMAP} fi if [ -n "$HARDWARECLOCK" ]; then - msg "Setting up RTC to '${HARDWARECLOCK}'...\n" + msg "Setting up RTC to '${HARDWARECLOCK}'..." TZ=$TIMEZONE hwclock --systz \ ${HARDWARECLOCK:+--$(echo $HARDWARECLOCK |tr A-Z a-z) --noadjfile} || emergency_shell fi diff --git a/core-services/02-udev.sh b/core-services/02-udev.sh index 84b40fc..56fa703 100644 --- a/core-services/02-udev.sh +++ b/core-services/02-udev.sh @@ -7,11 +7,11 @@ if [ -x /usr/lib/systemd/systemd-udevd ]; then elif [ -x /usr/sbin/udevd ]; then _udevd=/usr/sbin/udevd else - msg_warn "cannot find udevd!\n" + msg_warn "cannot find udevd!" fi if [ -n "${_udevd}" ]; then - msg "Starting udev and waiting for devices to settle...\n" + msg "Starting udev and waiting for devices to settle..." ${_udevd} --daemon udevadm trigger --action=add --type=subsystems udevadm trigger --action=add --type=devices diff --git a/core-services/04-swap.sh b/core-services/04-swap.sh index 22b2ee4..c805f87 100644 --- a/core-services/04-swap.sh +++ b/core-services/04-swap.sh @@ -2,5 +2,5 @@ [ -n "$VIRTUALIZATION" ] && return 0 -msg "Initializing swap...\n" +msg "Initializing swap..." swapon -a || emergency_shell diff --git a/core-services/07-kmods.sh b/core-services/07-kmods.sh index 32639e3..955d1c0 100644 --- a/core-services/07-kmods.sh +++ b/core-services/07-kmods.sh @@ -2,6 +2,6 @@ [ -n "$VIRTUALIZATION" ] && return 0 -msg "Loading kernel modules...\n" +msg "Loading kernel modules..." modules-load -v ${MODULES} | tr '\n' ' ' | sed 's:insmod [^ ]*/::g; s:\.ko\(\.gz\)\? ::g' echo diff --git a/core-services/08-sysctl.sh b/core-services/08-sysctl.sh index 6616784..2f393ee 100644 --- a/core-services/08-sysctl.sh +++ b/core-services/08-sysctl.sh @@ -1,6 +1,6 @@ # vim: set ts=4 sw=4 et: if [ -x /sbin/sysctl ]; then - msg "Loading sysctl(8) settings...\n" + msg "Loading sysctl(8) settings..." sysctl --system fi -- cgit 1.4.1