--- alx-src/branches/alxconf-060/init.d/alxsettings 2012/04/13 18:10:51 3475 +++ alx-src/branches/alxconf-060/init.d/alxsettings 2012/04/13 18:11:28 3476 @@ -122,7 +122,7 @@ # nice serial output $CURS_UP $SET_WCOL - echo "[ SN: ${ALX_SERIAL} ]" + rc_echo "[ SN: ${ALX_SERIAL} ]" if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}" then @@ -139,7 +139,7 @@ else # run hardware detection - echo + rc_echo if [[ ${ALX_FORCED_RECHECK} = true ]] then rc_mecho "Hardware autodetection forced by system-administrator" @@ -188,7 +188,7 @@ # nice serial output $CURS_UP $SET_WCOL - echo "[ SN: ${ALX_SERIAL} ]" + rc_echo "[ SN: ${ALX_SERIAL} ]" if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}" then @@ -226,7 +226,7 @@ # nice serial output $CURS_UP $SET_WCOL - echo "[ SN: ${ALX_SERIAL} ]" + rc_echo "[ SN: ${ALX_SERIAL} ]" # set ALX_STATE to ok so everybody knows that everything was ok ALX_STATE=ok @@ -248,7 +248,7 @@ # nice serial output $CURS_UP $SET_WCOL - echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]" + rc_echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]" fi fi @@ -290,7 +290,7 @@ source /etc/conf.d/hwsetup/knoppix source /etc/conf.d/hwsetup/mouse - echo + rc_echo rc_mecho "Importing detected settings to database" # network @@ -463,7 +463,7 @@ source /etc/conf.d/hwsetup/knoppix source /etc/conf.d/hwsetup/mouse - echo + rc_echo rc_mecho "Updating detected settings in database" # network @@ -560,7 +560,7 @@ # get setting from hwsetup source /etc/conf.d/hwsetup/knoppix - echo + rc_echo rc_mecho "Importing detected settings to local system" if [[ ${ALX_CONFD_NETWORKING} = false ]] @@ -782,7 +782,7 @@ ;; *) - echo "Usage: preliminary_network {start|stop}" + rc_echo "Usage: preliminary_network {start|stop}" ;; esac } @@ -978,6 +978,6 @@ ;; *) - echo "Usage: $0 {start|stop} ..." + rc_echo "Usage: $0 {start|stop} ..." ;; esac