commit: e0cf0e07688cd3991f6af20f2f27c0d278ebf069 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> AuthorDate: Tue Aug 6 20:08:07 2019 +0000 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org> CommitDate: Wed Aug 7 15:03:44 2019 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=e0cf0e07
initrd.scripts: kill_network(): Make use of good_msg_n() Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org> defaults/initrd.scripts | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index 88046b4..febdadf 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -2047,8 +2047,7 @@ kill_network() { # interface. if ipv6_tentative then - [ -z "${QUIET}" ] && \ - printf "%b" "${WARN}**${NORMAL}${BOLD} Waiting for tentative IPv6 addresses to complete DAD ${NORMAL}..." + [ -z "${QUIET}" ] && good_msg_n "Waiting for tentative IPv6 addresses to complete DAD ..." local dad_timeout=10 while [ ${dad_timeout} -gt 0 ] @@ -2056,11 +2055,10 @@ kill_network() { ipv6_tentative || break sleep 1 : $(( dad_timeout -= 1 )) - [ -z "${QUIET}" ] && \ - printf "." + [ -z "${QUIET}" ] && printf "." done - echo "" + [ -z "${QUIET}" ] && echo '' if [ ${dad_timeout} -le 0 ] then @@ -2068,8 +2066,7 @@ kill_network() { fi fi - [ -z "${QUIET}" ] && \ - printf "%b" "${GOOD}>>${NORMAL}${BOLD} Bringing down interface ${GK_NET_IFACE} ${NORMAL}..." + [ -z "${QUIET}" ] && good_msg_n "Bringing down interface ${GK_NET_IFACE} ..." local deconfiguration_timeout=${GK_NET_TIMEOUT_DECONFIGURATION} while [ ${deconfiguration_timeout} -gt 0 ] @@ -2083,11 +2080,10 @@ kill_network() { fi sleep 1 : $(( deconfiguration_timeout -= 1 )) - [ -z "${QUIET}" ] && \ - printf "." + [ -z "${QUIET}" ] && printf "." done - echo "" + [ -z "${QUIET}" ] && echo '' if [ ${deconfiguration_timeout} -le 0 ] then