Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/init.d/alxsettings

    Diff of /alx-src/branches/alxconf-060/init.d/alxsettings

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 3475 by niro, Fri Apr 13 17:29:18 2012 UTC revision 3476 by niro, Fri Apr 13 18:11:28 2012 UTC
    # Line 122  get_system_serial() Line 122  get_system_serial()
    122   # nice serial output   # nice serial output
    123   $CURS_UP   $CURS_UP
    124   $SET_WCOL   $SET_WCOL
    125   echo "[ SN: ${ALX_SERIAL} ]"   rc_echo "[ SN: ${ALX_SERIAL} ]"
    126    
    127   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
    128   then   then
    # Line 139  get_system_serial() Line 139  get_system_serial()
    139    
    140   else   else
    141   # run hardware detection   # run hardware detection
    142   echo   rc_echo
    143   if [[ ${ALX_FORCED_RECHECK} = true ]]   if [[ ${ALX_FORCED_RECHECK} = true ]]
    144   then   then
    145   rc_mecho "Hardware autodetection forced by system-administrator"   rc_mecho "Hardware autodetection forced by system-administrator"
    # Line 188  get_system_serial() Line 188  get_system_serial()
    188   # nice serial output   # nice serial output
    189   $CURS_UP   $CURS_UP
    190   $SET_WCOL   $SET_WCOL
    191   echo "[ SN: ${ALX_SERIAL} ]"   rc_echo "[ SN: ${ALX_SERIAL} ]"
    192    
    193   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
    194   then   then
    # Line 226  get_system_serial() Line 226  get_system_serial()
    226   # nice serial output   # nice serial output
    227   $CURS_UP   $CURS_UP
    228   $SET_WCOL   $SET_WCOL
    229   echo "[ SN: ${ALX_SERIAL} ]"   rc_echo "[ SN: ${ALX_SERIAL} ]"
    230    
    231   # set ALX_STATE to ok so everybody knows that everything was ok   # set ALX_STATE to ok so everybody knows that everything was ok
    232   ALX_STATE=ok   ALX_STATE=ok
    # Line 248  get_system_serial() Line 248  get_system_serial()
    248   # nice serial output   # nice serial output
    249   $CURS_UP   $CURS_UP
    250   $SET_WCOL   $SET_WCOL
    251   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"   rc_echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"
    252   fi   fi
    253   fi   fi
    254    
    # Line 290  import_settings_to_db() Line 290  import_settings_to_db()
    290   source /etc/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    291   source /etc/conf.d/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    292    
    293   echo   rc_echo
    294   rc_mecho "Importing detected settings to database"   rc_mecho "Importing detected settings to database"
    295    
    296   # network   # network
    # Line 463  update_settings_in_db() Line 463  update_settings_in_db()
    463   source /etc/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    464   source /etc/conf.d/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    465    
    466   echo   rc_echo
    467   rc_mecho "Updating detected settings in database"   rc_mecho "Updating detected settings in database"
    468    
    469   # network   # network
    # Line 560  import_settings_local() Line 560  import_settings_local()
    560   # get setting from hwsetup   # get setting from hwsetup
    561   source /etc/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    562    
    563   echo   rc_echo
    564   rc_mecho "Importing detected settings to local system"   rc_mecho "Importing detected settings to local system"
    565    
    566   if [[ ${ALX_CONFD_NETWORKING} = false ]]   if [[ ${ALX_CONFD_NETWORKING} = false ]]
    # Line 782  preliminary_network() Line 782  preliminary_network()
    782   ;;   ;;
    783    
    784   *)   *)
    785   echo "Usage: preliminary_network {start|stop}"   rc_echo "Usage: preliminary_network {start|stop}"
    786   ;;   ;;
    787   esac   esac
    788  }  }
    # Line 978  case $1 in Line 978  case $1 in
    978   ;;   ;;
    979    
    980   *)   *)
    981   echo "Usage: $0 {start|stop} ..."   rc_echo "Usage: $0 {start|stop} ..."
    982   ;;   ;;
    983  esac  esac
    Legend:
    Removed from v.3475  
    changed lines
      Added in v.3476