diff options
| author | Lukas Nykryn <lnykryn@redhat.com> | 2015-02-27 15:19:38 +0100 |
|---|---|---|
| committer | Lukas Nykryn <lnykryn@redhat.com> | 2015-02-27 15:19:38 +0100 |
| commit | 6b8e2996a8eb36aa70873f3d3e1728b57cdae571 (patch) | |
| tree | 6246dc072ff45516777189962f574e570c88dde9 /rc.d | |
| parent | 218e4d58ed0a1a8a5e6d75b178940a097444801d (diff) | |
| download | initscripts-6b8e2996a8eb36aa70873f3d3e1728b57cdae571.tar initscripts-6b8e2996a8eb36aa70873f3d3e1728b57cdae571.tar.gz initscripts-6b8e2996a8eb36aa70873f3d3e1728b57cdae571.tar.bz2 initscripts-6b8e2996a8eb36aa70873f3d3e1728b57cdae571.tar.xz initscripts-6b8e2996a8eb36aa70873f3d3e1728b57cdae571.zip | |
rc.sysinit: be more verbose
Diffstat (limited to 'rc.d')
| -rw-r--r-- | rc.d/init.d/functions | 13 | ||||
| -rwxr-xr-x | rc.d/rc.sysinit | 6 |
2 files changed, 16 insertions, 3 deletions
diff --git a/rc.d/init.d/functions b/rc.d/init.d/functions index 8786e941..e3cae113 100644 --- a/rc.d/init.d/functions +++ b/rc.d/init.d/functions @@ -577,6 +577,19 @@ action() { return $rc } +# Run some action. Silently. +action_silent() { + local STRING rc + + STRING=$1 + echo -n "$STRING " + shift + "$@" >/dev/null && success $"$STRING" || failure $"$STRING" + rc=$? + echo + return $rc +} + # returns OK if $1 contains $2 strstr() { [ "${1#*$2*}" = "$1" ] && return 1 diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 7f761156..a81c0bc2 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -184,7 +184,7 @@ if ! strstr "$cmdline" nompath && [ -f /etc/multipath.conf -a \ modprobe dm-multipath > /dev/null 2>&1 /sbin/multipath -v 0 if [ -x /sbin/kpartx ]; then - /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" >/dev/null + action_silent $"Add partition mappings: " /sbin/dmsetup ls --target multipath --exec "/sbin/kpartx -a -p p" fi fi @@ -197,14 +197,14 @@ if ! strstr "$cmdline" nodmraid && [ -x /sbin/dmraid ]; then ! strstr "$cmdline" noiswmd; then continue fi - /sbin/dmraid -ay -i --rm_partitions -p "$dmname" >/dev/null 2>&1 + action_silent $"Activate software (ATA)RAID: " /sbin/dmraid -ay -i --rm_partitions -p "$dmname" /sbin/kpartx -a -p p "/dev/mapper/$dmname" done fi fi # Start any MD RAID arrays that haven't been started yet -[ -r /proc/mdstat -a -r /dev/md/md-device-map ] && /sbin/mdadm -IRs +[ -r /proc/mdstat -a -r /dev/md/md-device-map ] && action $"Run MD devices: " /sbin/mdadm -IRs if [ -x /sbin/lvm ]; then if [ ! -f /.nolvm ] && ! strstr "$cmdline" nolvm ; then |