summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/core/libs/lib-misc.sh10
-rw-r--r--src/core/libs/lib-network.sh1
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
}