diff options
| author | Michael Prokop <mika@debian.org> | 2010-06-14 12:17:51 +0200 |
|---|---|---|
| committer | Michael Prokop <mika@debian.org> | 2010-06-14 12:17:51 +0200 |
| commit | 3a02c6f37d4c331b347692a0200941c4c59b3ea3 (patch) | |
| tree | 422d00053fe72fa9c467fd89f2eb1fdd207089f6 | |
| parent | ab28c77261267a14cc7308e8c4d7a0b48a8ac2ab (diff) | |
| download | initramfs-tools-3a02c6f37d4c331b347692a0200941c4c59b3ea3.tar.gz initramfs-tools-3a02c6f37d4c331b347692a0200941c4c59b3ea3.zip | |
code cleanup: consequently use "W:" for warnings.
The only exception is log_warning_msg() inside scripts/functions
which is/can be used by external scripts.
Signed-off-by: Michael Prokop <mika@debian.org>
| -rw-r--r-- | hook-functions | 4 | ||||
| -rwxr-xr-x | hooks/busybox | 2 | ||||
| -rwxr-xr-x | mkinitramfs | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/hook-functions b/hook-functions index c456c5d..ffb6a67 100644 --- a/hook-functions +++ b/hook-functions @@ -3,7 +3,7 @@ catenate_cpiogz() { # Sanity check if [ ! -e "${1}" ]; then - echo "W:catenate_cpiogz: arg1='${1}' does not exist." >&2 + echo "W: catenate_cpiogz: arg1='${1}' does not exist." >&2 return fi @@ -29,7 +29,7 @@ add_modules_from_file() { # Sanity check if [ ! -e "${1}" ]; then - echo "W:add_modules_from_file: arg1='${1}' does not exist." >&2 + echo "W: add_modules_from_file: arg1='${1}' does not exist." >&2 return fi diff --git a/hooks/busybox b/hooks/busybox index a2e57ae..1a275b7 100755 --- a/hooks/busybox +++ b/hooks/busybox @@ -20,7 +20,7 @@ if [ "${BUSYBOX}" = "n" ] || [ ! -e ${BUSYBOXDIR}/busybox ]; then # those root need busybox eval "$(mount | awk '/ \/ / {print "r_dev=" $1; exit}')" if [ "${r_dev#/dev/mapper/}" != "${r_dev}" ]; then - echo "Warning: Busybox is required for successful boot!" + echo "W: Busybox is required for successful boot!" fi else . /usr/share/initramfs-tools/hook-functions diff --git a/mkinitramfs b/mkinitramfs index a854f02..1c6ad28 100755 --- a/mkinitramfs +++ b/mkinitramfs @@ -224,8 +224,8 @@ list) # nothing to add ;; *) - echo "mkinitramfs: Warning unsupported MODULES setting: ${MODULES}." - echo "mkinitramfs: Falling back to MODULES=most." + echo "W: mkinitramfs: unsupported MODULES setting: ${MODULES}." + echo "W: mkinitramfs: Falling back to MODULES=most." auto_add_modules ;; esac @@ -286,7 +286,7 @@ run_scripts "${CONFDIR}"/hooks # cache boot run order if [ -n "$NOEXEC" ]; then - echo "Warning: TMPDIR is mounted noexec, will not cache run scripts." + echo "W: TMPDIR is mounted noexec, will not cache run scripts." else for b in $(cd "${DESTDIR}/scripts" && find . -mindepth 1 -type d); do cache_run_scripts "${DESTDIR}" "/scripts/${b#./}" |