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 275 by niro, Sun Jul 10 17:55:03 2005 UTC revision 307 by niro, Sun Aug 28 19:30:53 2005 UTC
    # Line 11  Line 11 
    11  #%before:  #%before:
    12  #%after:  #%after:
    13    
    14  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.14 2005-07-10 17:55:03 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.18 2005-08-28 19:30:53 niro Exp $
    15    
    16  # checks first if the client was already configured and if it has an valid serial  # checks first if the client was already configured and if it has an valid serial
    17  # if not it runs the autoconfiguration script  # if not it runs the autoconfiguration script
    # Line 24  Line 24 
    24  source /etc/sysconfig/rc  source /etc/sysconfig/rc
    25  source $rc_functions  source $rc_functions
    26    
    27  #mysql settings  # mysql settings
    28  source /etc/alxconfig-ng/config.rc  source /etc/alxconfig-ng/config.rc
    29    
    30    # helper functions
    31  source /usr/lib/alxconfig-ng/functions/mysqlfunctions  source /usr/lib/alxconfig-ng/functions/mysqlfunctions
    32  source /usr/lib/alxconfig-ng/functions/serial_functions  source /usr/lib/alxconfig-ng/functions/serial_functions
    33  source /usr/lib/alxconfig-ng/functions/config_modules  source /usr/lib/alxconfig-ng/functions/config_modules
    # Line 36  source /usr/lib/alxconfig-ng/functions/c Line 38  source /usr/lib/alxconfig-ng/functions/c
    38  source /usr/lib/alxconfig-ng/functions/config_auth  source /usr/lib/alxconfig-ng/functions/config_auth
    39  source /usr/lib/alxconfig-ng/functions/config_ssh_auth  source /usr/lib/alxconfig-ng/functions/config_ssh_auth
    40    
    41  #check if mysql is available  # check if mysql is available
    42  [ -x /usr/bin/mysql ] && MYSQL_ALX=true  [ -x /usr/bin/mysql ] && MYSQL_ALX=true
    43    
    44  #other needed vars  # other needed vars
    45  ALX_HW_DETECT=false  ALX_HW_DETECT=false
    46    ALX_FORCED_RECHECK=false
    47    
    48  #unset vars which may kill us  # unset vars which may kill us
    49  unset ALX_SERIAL ALX_STATE  unset ALX_SERIAL ALX_STATE
    50    
    51    
    52  #setup needed directories  # setup needed directories
    53  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state
    54    
    55    
    # Line 80  get_system_serial(){ Line 83  get_system_serial(){
    83    
    84   local CUR_IP CUR_MAC CUR_MTIME   local CUR_IP CUR_MAC CUR_MTIME
    85    
    86   #check if serial file exists   # check if serial file exists
    87   if [ -f /etc/alxconfig-ng/serial ]   if [ -f /etc/alxconfig-ng/serial ] && [ ! -f /hardware-auto-detection ]
    88   then   then
    89   source /etc/alxconfig-ng/serial   source /etc/alxconfig-ng/serial
    90    
    91   #start preliminary networking (dhcp)   # start preliminary networking (dhcp)
    92   preliminary_network start   preliminary_network start
    93    
    94     # check if mysql server is reachable
    95     # if not abort this script
    96     if ! reach_mysql_server
    97     then
    98     preliminary_network stop
    99     exit 1
    100     fi
    101    
    102   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
    103   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
    104   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    105    
    106   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
    107    
    108   #nice serial output   # nice serial output
    109   $CURS_UP   $CURS_UP
    110   $SET_WCOL   $SET_WCOL
    111   echo "[ SN: ${ALX_SERIAL} ]"   echo "[ SN: ${ALX_SERIAL} ]"
    # Line 103  get_system_serial(){ Line 114  get_system_serial(){
    114   then   then
    115   ALX_STATE="ok"   ALX_STATE="ok"
    116   else   else
    117     # abort on non valid serial
    118   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
    119     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
    120     show_invalid_serial_msg
    121     exit 1
    122   fi   fi
    123    
    124   else   else
    125   #run hardware detection   # run hardware detection
    126   echo   echo
    127   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   if [ -f /hardware-auto-detection ]
    128     then
    129     echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
    130     else
    131     echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
    132     fi
    133   ALX_HW_DETECT=true   ALX_HW_DETECT=true
    134   /etc/init.d/hwdetect start   /etc/init.d/hwdetect start
    135    
    136   #set hostname to alx_default_hostname   # set hostname to alx_default_hostname
    137     # use old hostname if this is a forced re-check
    138     [ -f /hardware-auto-detection ] && ALX_DEFAULT_HOSTNAME="$(< /etc/hostname)"
    139   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    140   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
    141    
    142   #update the hostname on the system for sure   # update the hostname on the system for sure
    143   echo "${HOSTNAME}" > /etc/hostname   echo "${HOSTNAME}" > /etc/hostname
    144    
    145   #start preliminary networking (dhcp)   # start preliminary networking (dhcp)
    146   preliminary_network start   preliminary_network start
    147    
    148     # check if mysql server is reachable
    149     # if not abort this script
    150     if ! reach_mysql_server
    151     then
    152     preliminary_network stop
    153     exit 1
    154     fi
    155    
    156   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
    157   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
    158   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    159    
    160     # abort now if this is a forced re-check
    161     if [ -f /hardware-auto-detection ]
    162     then
    163     # but first check the serial
    164     source /etc/alxconfig-ng/serial
    165    
    166     echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
    167    
    168     # nice serial output
    169     $CURS_UP
    170     $SET_WCOL
    171     echo "[ SN: ${ALX_SERIAL} ]"
    172    
    173     if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
    174     then
    175     ALX_STATE="ok"
    176     else
    177     # abort on non valid serial
    178     ALX_STATE="invalid serial"
    179     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
    180     show_invalid_serial_msg
    181     exit 1
    182     fi
    183    
    184     # write current state to temp file
    185     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
    186     rm /hardware-auto-detection
    187    
    188     # now export ALX_FORCED_RECHECK=true
    189     # that the setting will be updated not inserted !
    190     export ALX_FORCED_RECHECK=true
    191     return 0
    192     fi
    193    
    194   echo -e ${COLOREDSTAR} "Trying to get new serial ..."   echo -e ${COLOREDSTAR} "Trying to get new serial ..."
    195    
    196   #request new serial   # request new serial
    197   #ALX_REG_DATE="$(date +%F)"   # ALX_REG_DATE="$(date +%F)"
    198    
    199   #we're using the mtime now (better for vaildating the serial)   # we're using the mtime now (better for vaildating the serial)
    200   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
    201   "insert into client_serials(   "insert into client_serials(
    202   mtime,   mtime,
    # Line 143  get_system_serial(){ Line 207  get_system_serial(){
    207   '${CUR_MAC}'   '${CUR_MAC}'
    208   );"   );"
    209    
    210   #then validate and retrieve serial   # then validate and retrieve serial
    211    
    212   ### warning must be changed that only the LAST ID will be fetched,  ###   ### warning must be changed that only the LAST ID will be fetched,  ###
    213   ### or you get error if the computer name and date are the same     ###   ### or you get error if the computer name and date are the same     ###
    214   ### you have more than one serial number then                       ###   ### you have more than one serial number then                       ###
    215    
    216   #select highest id only (added max)   # select highest id only (added max)
    217   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
    218   "select max(serial) from client_serials where mtime='${CUR_MTIME}' and mac='${CUR_MAC}'")   "select max(serial) from client_serials where mtime='${CUR_MTIME}' and mac='${CUR_MAC}'")
    219    
    220   if [ "${ALX_SERIAL}" != NULL ]   if [ "${ALX_SERIAL}" != NULL ]
    221   then   then
    222   #nice serial output   # nice serial output
    223   $CURS_UP   $CURS_UP
    224   $SET_WCOL   $SET_WCOL
    225   echo "[ SN: ${ALX_SERIAL} ]"   echo "[ SN: ${ALX_SERIAL} ]"
    226    
    227   #set ALX_STATE to ok so everybody that everything was ok   # set ALX_STATE to ok so everybody that everything was ok
    228   ALX_STATE=ok   ALX_STATE=ok
    229    
    230   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial
    # Line 168  get_system_serial(){ Line 232  get_system_serial(){
    232    
    233   evaluate_retval   evaluate_retval
    234   else   else
    235   #print false (works only if this is the first statement here)   # print false (works only if this is the first statement here)
    236   evaluate_retval   evaluate_retval
    237    
    238   #set ALX_STATE to error so everybody sees there was an error   # set ALX_STATE to error so everybody sees there was an error
    239   ALX_STATE=error   ALX_STATE=error
    240    
    241   #show an error that no new serial was found   # show an error that no new serial was found
    242   #nice serial output   # nice serial output
    243   $CURS_UP   $CURS_UP
    244   $SET_WCOL   $SET_WCOL
    245   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"
    246   fi   fi
    247   fi   fi
    248    
    249   #write current state to temp file   # write current state to temp file
    250   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
    251  }  }
    252    
    # Line 199  check_is_configured() { Line 263  check_is_configured() {
    263    
    264  # imports current settings to the database resolved by the hardware detection  # imports current settings to the database resolved by the hardware detection
    265  import_settings_to_db() {  import_settings_to_db() {
    266   #note: networking is always 'dhcp' if hw was autodetected   # note: networking is always 'dhcp' if hw was autodetected
    267   #note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
    268    
    269   #to be safe, we do some sanity checks   # to be safe, we do some sanity checks
    270   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    271   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    272    
    273   #vars used by hwdetect   # vars used by hwdetect
    274   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    275   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    276   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    277    
    278   #get setting from hwdetect   # get setting from hwdetect
    279   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
    280   source /etc/sysconfig/hwsetup/mouse   source /etc/sysconfig/hwsetup/mouse
    281    
    282   echo   echo
    283   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
    284    
    285   #network   # network
    286   echo -e "      Network settings ..."   echo -e "      Network settings ..."
    287   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
    288   "insert into cfg_network(   "insert into cfg_network(
    # Line 237  import_settings_to_db() { Line 301  import_settings_to_db() {
    301   );"   );"
    302   evaluate_retval   evaluate_retval
    303    
    304   #xserver   # xserver
    305   echo -e "      Graphic settings ..."   echo -e "      Graphic settings ..."
    306   #xserver general   # xserver general
    307   ( mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ( mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
    308   "insert into cfg_graphic(   "insert into cfg_graphic(
    309   serial,   serial,
    # Line 297  import_settings_to_db() { Line 361  import_settings_to_db() {
    361   evaluate_retval   evaluate_retval
    362  }  }
    363    
    364    # imports current settings to the database resolved by the hardware detection
    365    update_settings_in_db() {
    366     # note: networking is always 'dhcp' if hw was autodetected
    367     # note: default_domain/hostname is set in config.rc or exported
    368     # note: we updating only hardware settings here !
    369    
    370     # to be safe, we do some sanity checks
    371     [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    372     [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    373    
    374     # vars used by hwdetect
    375     local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    376     local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    377     local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    378    
    379     # get setting from hwdetect
    380     source /etc/sysconfig/hwsetup/knoppix
    381     source /etc/sysconfig/hwsetup/mouse
    382    
    383     echo
    384     echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}
    385    
    386     # network
    387     echo -e "      Network settings ..."
    388    
    389     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
    390     "update cfg_network set
    391     hostname='${ALX_DEFAULT_HOSTNAME}',
    392     module='${NETCARD_DRIVER}',
    393     domain='${ALX_DEFAULT_DOMAIN}',
    394     networking='dhcp'
    395     where serial=${ALX_SERIAL};"
    396     evaluate_retval
    397    
    398     # xserver
    399     echo -e "      Graphic settings ..."
    400     # xserver general
    401     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
    402     "update cfg_graphic set
    403     module='${XMODULE}',
    404     resolution='1024x768',
    405     depth='16',
    406     monitorid='0'
    407     where serial=${ALX_SERIAL};"
    408     evaluate_retval
    409    
    410     # input
    411     echo -e "      Input settings ..."
    412     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
    413     "update cfg_input set
    414     mouse='${XMOUSETYPE}'
    415     where serial=${ALX_SERIAL};"
    416     evaluate_retval
    417    }
    418    
    419  # imports current settings to the local system resolved by the hardware detection  # imports current settings to the local system resolved by the hardware detection
    420  # we only need the network settings  # we only need the network settings
    421  import_settings_local(){  import_settings_local(){
    422   #note: networking is always 'dhcp' if hw was autodetected   # note: networking is always 'dhcp' if hw was autodetected
    423   #note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
    424    
    425   #to be safe, we do some sanity checks   # to be safe, we do some sanity checks
    426   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    427   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    428    
    429   #vars used by hwdetect   # vars used by hwdetect
    430   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    431   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    432   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    433    
    434   #get setting from hwdetect   # get setting from hwdetect
    435   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
    436    
    437   echo   echo
    # Line 322  import_settings_local(){ Line 441  import_settings_local(){
    441   echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules   echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
    442   evaluate_retval   evaluate_retval
    443    
    444   #set system state to 'already configured'   # set system state to 'already configured'
    445   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
    446    
    447   # create a fresh fluxbox directory   # create a fresh fluxbox directory
    # Line 339  import_settings_local(){ Line 458  import_settings_local(){
    458   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header \
    459   > ${ALX_UNPRIV_HOME}/.fluxbox/menu   > ${ALX_UNPRIV_HOME}/.fluxbox/menu
    460    
    461     # now fix it with proper messages :P
    462     local ver="$(< /etc/mageversion)"
    463     sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \
    464     ${ALX_UNPRIV_HOME}/.fluxbox/menu
    465    
    466   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
    467   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    468    
    # Line 349  import_settings_local(){ Line 473  import_settings_local(){
    473   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    474   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    475    
    476     # set correct permissions
    477     chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    478     chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    479     chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    480    
    481   # default passwords are bad   # default passwords are bad
    482   #usermod -p $(perl -e "printf(crypt('foobar','AD'))") root   #usermod -p $(perl -e "printf(crypt('foobar','AD'))") root
    483   #usermod -p $(perl -e "printf(crypt('foobar','AD'))") ${ALX_UNPRIV_USER}   #usermod -p $(perl -e "printf(crypt('foobar','AD'))") ${ALX_UNPRIV_USER}
    484   #smbpasswd -a root foobar   #smbpasswd -a root foobar
    485  }  }
    486    
    487  #start|stop  # start|stop
    488  preliminary_network(){  preliminary_network(){
    489   local module   local module
    490    
    491   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
    492   then   then
    493   #get module name   # get module name
    494   module=$(cat ${SETTINGSPATH}/modules)   module=$(cat ${SETTINGSPATH}/modules)
    495   modprobe ${module}   modprobe ${module}
    496   else   else
    497   #vars used by hwdetect   # vars used by hwdetect
    498   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    499   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    500    
    501   #get setting from hwdetect   # get setting from hwdetect
    502   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
    503   modprobe ${NETCARD_DRIVER}   modprobe ${NETCARD_DRIVER}
    504   fi   fi
    # Line 389  preliminary_network(){ Line 518  preliminary_network(){
    518   fi   fi
    519    
    520   echo -e ${COLMAGENTA}"Starting preliminary network ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Starting preliminary network ... "${COLDEFAULT}
    521   dhcpcd &> /dev/null   # -t 10 timeout of 10 secs
    522     dhcpcd -t 10 &> /dev/null
    523    
    524   # aka_fix ########################################   # aka_fix ########################################
    525   #ifconfig eth0 128.20.222.222 netmask 255.255.0.0 up   #ifconfig eth0 128.20.222.222 netmask 255.255.0.0 up
    # Line 419  preliminary_network(){ Line 549  preliminary_network(){
    549    
    550  case $1 in  case $1 in
    551   start)   start)
    552   #retrieve or validate current serial   # retrieve or validate current serial
    553   get_system_serial   get_system_serial
    554   if [ "${ALX_HW_DETECT}" == "true" ]   if [[ ${ALX_HW_DETECT} = true ]]
    555   then   then
    556   import_settings_to_db   if [[ ${ALX_FORCED_RECHECK} = true ]]
    557     then
    558     update_settings_in_db
    559     else
    560     import_settings_to_db
    561     fi
    562   import_settings_local   import_settings_local
    563    
    564   # here we should also exchange the ssh keys   # here we should also exchange the ssh keys
    # Line 432  case $1 in Line 567  case $1 in
    567   config_ssh_auth   config_ssh_auth
    568   fi   fi
    569    
    570   #now setup system configuration   # now setup system configuration
    571   #alx_setup_or_whatever_it_will_be_called()   # alx_setup_or_whatever_it_will_be_called()
    572   [ "${ALX_HW_DETECT}" == "false" ] && update_system_settings   [ "${ALX_HW_DETECT}" == "false" ] && update_system_settings
    573    
    574   #stop at last the preliminary networking (dhcp)   # stop at last the preliminary networking (dhcp)
    575   preliminary_network stop   preliminary_network stop
    576   ;;   ;;
    577    
    578   stop)   stop)
    579   #unset_alx_connected #--> now in alxsetstate-rc6   # unset_alx_connected #--> now in alxsetstate-rc6
    580   # ! important !: del systemstate   # ! important !: del systemstate
    581   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
    582   sleep 0.1   sleep 0.1
    Legend:
    Removed from v.275  
    changed lines
      Added in v.307