From 41603956b699d12f21b551bdf10846e79d38fb46 Mon Sep 17 00:00:00 2001 From: Dieter Plaetinck Date: Sat, 1 Jan 2011 23:04:33 +0100 Subject: make sure all {pre,post}configure_target functions use good return codes target_configure_initial_keymap_font and target_configure_network would falsely return >0 in some occasions, causing unneeded warnings. --- src/core/libs/lib-misc.sh | 10 ++++++++-- src/core/libs/lib-network.sh | 1 + 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/core/libs/lib-misc.sh b/src/core/libs/lib-misc.sh index 177c8b7..13379a2 100644 --- a/src/core/libs/lib-misc.sh +++ b/src/core/libs/lib-misc.sh @@ -137,8 +137,14 @@ dohwclock() { target_configure_initial_keymap_font () { - [ -n "$var_KEYMAP" ] && sed -i "s/^KEYMAP=.*/KEYMAP=\"`basename $var_KEYMAP .map.gz`\"/" ${var_TARGET_DIR}/etc/rc.conf - [ -n "$var_CONSOLEFONT" ] && sed -i "s/^CONSOLEFONT=.*/CONSOLEFONT=\"${var_CONSOLEFONT/\.*/}\"/" ${var_TARGET_DIR}/etc/rc.conf + ret=0 + if [ -n "$var_KEYMAP" ]; then + sed -i "s/^KEYMAP=.*/KEYMAP=\"`basename $var_KEYMAP .map.gz`\"/" ${var_TARGET_DIR}/etc/rc.conf || ret=$? + fi + if [ -n "$var_CONSOLEFONT" ]; then + sed -i "s/^CONSOLEFONT=.*/CONSOLEFONT=\"${var_CONSOLEFONT/\.*/}\"/" ${var_TARGET_DIR}/etc/rc.conf || ret=$? + fi + return $ret } target_configure_time () { diff --git a/src/core/libs/lib-network.sh b/src/core/libs/lib-network.sh index 1499dbf..bc17898 100644 --- a/src/core/libs/lib-network.sh +++ b/src/core/libs/lib-network.sh @@ -49,4 +49,5 @@ target_configure_network() echo "export ftp_proxy=$PROXY_FTP" >> ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 chmod a+x ${var_TARGET_DIR}/etc/profile.d/proxy.sh || return 1 fi + return 0 } -- cgit v1.2.3