Magellan Linux

Diff of /alx-src/trunk/alxconfig-ng/init.d/alxsettings

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

revision 221 by niro, Tue Mar 8 20:49:14 2005 UTC revision 239 by niro, Tue Apr 12 20:46:52 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.7 2005-04-12 20:45:55 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
18  # these settings will be used for client setup  # these settings will be used for client setup
# Line 19  Line 21 
21  # if no changes are at server side they will be kept, if yes the get updated.  # if no changes are at server side they will be kept, if yes the get updated.
22  # the server settings has higher priority.  # the server settings has higher priority.
23    
 #                       +-----+  
 #                       |start|  
 #                       +-----+  
 #                          |  
 #                          |  
 #              start_preliminary_network  
 #                          |  
 #                          |       n  
 #                  serial_check ------->  get_new_serial  
 #                          |                      |  
 #                         y|                      |  
 #                          |           n          |  
 #                check_is_configured ---->  run_hw_detection  
 #                          |                      |  
 #                         y|                      |  
 #            n             |                      |  
 #        +--------cfg_equal_to_db          import_settings_to_db  
 #        |                 |                      |  
 #   update_from_db        y|                      |  
 #        |                 |                      |  
 #   set_is_configured      |                  set_is_configured  
 #        +-----------------|                      |  
 #                          +----------------------+  
 #                          |  
 #                          |  
 #               stop_preliminary_network  
 #                          |  
 #                          |  
 #                       +----+  
 #                       |done|  
 #                       +----+  
 #                          |  
 #                          |  
 #                 normal_system_bootup  
 #                          |  
 #                          .  
 #                          .  
 #                          .  
 #  
 #  
 #  
   
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/alx-config/config.rc  source /etc/alxconfig-ng/config.rc
29  source /opt/alx-config/functions/mysqlfunctions  source /usr/lib/alxconfig-ng/functions/mysqlfunctions
30  source /opt/alx-config/functions/alx-mysql-functions  source /usr/lib/alxconfig-ng/functions/serial_functions
31    source /usr/lib/alxconfig-ng/functions/config_network
32    source /usr/lib/alxconfig-ng/functions/config_printers
33    source /usr/lib/alxconfig-ng/functions/config_sessions
34    source /usr/lib/alxconfig-ng/functions/config_x11
35    
36  #check if mysql is available  #check if mysql is available
37  [ -x /usr/bin/mysql ] && MYSQL_ALX=true  [ -x /usr/bin/mysql ] && MYSQL_ALX=true
38    
39  #other needed vars  #other needed vars
40  ALX_HW_DETECT=false  ALX_HW_DETECT=false
 ALX_NETWORK_SETUP=false  
 ALX_XSERVER_SETUP=false  
 ALX_SESSION_SETUP=false  
 ALX_PRINTER_SETUP=false  
41    
42  #unset vars which may kill us  #unset vars which may kill us
43  unset ALX_SERIAL ALX_STATE  unset ALX_SERIAL ALX_STATE
44    
45    
46  #setup needed directories  #setup needed directories
47  [ ! -d /etc/alx-config/state ] && install -d /etc/alx-config/state  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state
   
   
 # still a need to implement this ?  
 # #needed to detect usb/livecd boot  
 # if [ -e /.bootdev ]  
 # then  
 # source /.bootdev  
 # else  
 # echo "Couldn't find /.bootdev. Aborting."  
 # exit 1  
 # fi  
   
 # still a need to implement this ? --> media-check ?  
 settings_import() {  
  if [ "${FSTYPE}" == "vfat" ]  
  then  
  if [ -e /mnt/cdrom/settings/system ]  
  then  
  echo -e ${COLOREDSTAR}"Importing old alx-settings ..."  
  ( cp -R /mnt/cdrom/settings/system/* /etc/alx-config/settings/menu &&  
   source /etc/alx-config/config.rc &&  
   source /opt/alx-config/Configurator/config_functions.sh &&  
   setup_xfree > /dev/null 2>&1 &&  
   setup_modules > /dev/null 2>&1 &&  
   setup_network > /dev/null 2>&1 &&  
   #setup_printers > /dev/null 2>&1 &&  
   setup_sessions > /dev/null 2>&1 &&  
   touch /etc/alx-config/imported )  
  evaluate_retval  
  fi  
  fi  
 }  
   
   
 # this thingy needs an complete rewrite.  
 # first get all settings from db server,  
 # than check against local system settings,  
 # if there are any differences, update the local settings,  
 # as the server has a higher priority.  
 # Important: write local settings only if they make sense,  
 #            to have a fallback in case the server is down!  
 #get_settings_from_server(){  
 # #some needed arrays  
 # #ARRAY_NETWORK #module domain networking netmask dns gateway  
 # #SESSION #  
 # #GRAFIK  #  
 #  
 # echo "Importing now old Settings ..."  
 #  
 # local serial module domain networking netmask dns gateway i x all  
 #  
 # declare -i i=0  
 #  
 # #get hostname from database  
 # MY_HOSTNAME=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select hostname from cfg_serial where id='${ALX_SERIAL}'")  
 #  
 # #get network settings from database  
 # all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select module,  
 # domain,  
 # networking,  
 # netmask,  
 # dns,  
 # gateway,  
 # broadcast,  
 # ip  
 # from cfg_network where serial='${ALX_SERIAL}'")  
 # #split'em up and put in array  
 # for x in ${all}  
 # do  
 # ARRAY_NETWORK[${i}]=${x}  
 # ((i++))  
 # done  
 # echo " Network:"  
 # echo "   MODULE:     ${ARRAY_NETWORK[0]}"  
 # echo "   IP:         ${ARRAY_NETWORK[7]}"  
 # echo "   HOSTNAME:   ${MY_HOSTNAME}"  
 # echo "   DOMAIN:     ${ARRAY_NETWORK[1]}"  
 # echo "   NETWORKING: ${ARRAY_NETWORK[2]}"  
 # echo "   NETMASK:    ${ARRAY_NETWORK[3]}"  
 # echo "   DNS:        ${ARRAY_NETWORK[4]}"  
 # echo "   GATEWAY:    ${ARRAY_NETWORK[5]}"  
 # echo "   BROADCAST:  ${ARRAY_NETWORK[6]}"  
 # echo  
 #  
 # #get x settings from database  
 # local module resolution  
 #  
 # #reset i  
 # declare -i i=0  
 # all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select module,  
 # resolution  
 # from cfg_grafik where serial='${ALX_SERIAL}'")  
 # #split'em up and put in array  
 # for x in ${all}  
 # do  
 # ARRAY_GRAFIK[${i}]=${x}  
 # ((i++))  
 # done  
 #  
 # echo " VGA:"  
 # echo "   MODULE:     ${ARRAY_GRAFIK[0]}"  
 # echo "   RESOLUTION: ${ARRAY_GRAFIK[1]}"  
 # echo  
 #  
 # #get ica-sessions from database  
 # ARRAY_SESSIONS=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select session from cfg_session where serial='${ALX_SERIAL}'")  
 #  
 # echo " SESSIONS:"  
 # declare -i i=0  
 # for x in ${ARRAY_SESSIONS}  
 # do  
 # ((i++))  
 # echo "   SESSION${i}:   ${x}"  
 # done  
 # echo  
 #  
 # #now write these settings  
 # local SETTINGSPATH  
 #  
 # #network  
 #  
 # #settings must be also set on system, so we put this to menu  
 # SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
 #  
 # [ ! -d ${SETTINGSPATH}/modules ] && install -d ${SETTINGSPATH}/modules  
 # echo "${ARRAY_NETWORK[0]}" > ${SETTINGSPATH}/modules/modules  
 #  
 # [ ! -d ${SETTINGSPATH}/network ] && install -d ${SETTINGSPATH}/network  
 # echo "${MY_HOSTNAME}" > ${SETTINGSPATH}/network/hostname  
 # echo "${ARRAY_NETWORK[1]}" > ${SETTINGSPATH}/network/domain  
 # echo "${ARRAY_NETWORK[2]}" > ${SETTINGSPATH}/network/networking  
 # [ -n "${ARRAY_NETWORK[3]}" ] && echo "${ARRAY_NETWORK[3]}" > ${SETTINGSPATH}/network/netmask  
 # [ -n "${ARRAY_NETWORK[4]}" ] && echo "${ARRAY_NETWORK[4]}" > ${SETTINGSPATH}/network/dns  
 # [ -n "${ARRAY_NETWORK[5]}" ] && echo "${ARRAY_NETWORK[5]}" > ${SETTINGSPATH}/network/gateway  
 # [ -n "${ARRAY_NETWORK[6]}" ] && echo "${ARRAY_NETWORK[6]}" > ${SETTINGSPATH}/network/broadcast  
 # [ -n "${ARRAY_NETWORK[7]}" ] && echo "${ARRAY_NETWORK[7]}" > ${SETTINGSPATH}/network/ip  
   
   
 validate_networking(){  
  #source /opt/alx-config/Configurator/config_functions.sh  
   
  local x i all LOCAL_NETWORK DB_NETWORK SETTINGSPATH  
   
  #all arrays:  
  # ->  hostname modules domain networking ip netmask dns gateway broadcast  
   
   #networking  
  #get settings from local system  
  SETTINGSPATH=${SETTINGS_TEMPLATE}/system  
  declare -i i=0  
  for x in network/hostname \  
  modules/modules \  
  network/domain \  
  network/networking \  
  network/ip \  
  network/netmask \  
  network/dns \  
  network/gateway \  
  network/broadcast  
  do  
  if [ -f ${SETTINGSPATH}/${x} ]  
  then  
  #file exist, then use content  
  LOCAL_NETWORK[${i}]="$(< ${SETTINGSPATH}/${x})"  
  else  
  LOCAL_NETWORK[${i}]=""  
  fi  
  ((i++))  
  done  
   
  #get settings from database  
 # DB_NETWORK[0]=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select hostname from cfg_network where serial='${ALX_SERIAL}'")  
   
  all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  "select hostname,  
  module,  
  domain,  
  networking,  
  ip,  
  netmask,  
  dns,  
  gateway,  
  broadcast  
  from cfg_network where serial='${ALX_SERIAL}'")  
   
  #split'em up and put in an array  
  declare -i i=0  
  for x in ${all}  
  do  
  DB_NETWORK[${i}]=${x}  
  ((i++))  
  done  
   
  #needed by the small hotfix  
  local FIX_ME  
  FIX_ME="${DB_NETWORK[2]}"  
   
   
  #now compare this stuff if they are equal  
  for ((i=0; i < 9; i++))  
  do  
  if [ "${DB_NETWORK[${i}]}" = "${LOCAL_NETWORK[${i}]}" ]  
  then  
  echo "${i}: ${DB_NETWORK[${i}]} == ${LOCAL_NETWORK[${i}]}"  
   
  #delete equal stuff from DB_NETWORK  
  DB_NETWORK[${i}]="*NULL*"  
   
  else  
  echo "${i}: ${DB_NETWORK[${i}]} != ${LOCAL_NETWORK[${i}]}"  
  fi  
  done  
   
   
  #update configs  
  SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
  declare -i i=0  
  for x in network/hostname \  
  modules/modules \  
  network/domain \  
  network/networking \  
  network/ip \  
  network/netmask \  
  network/dns \  
  network/gateway \  
  network/broadcast  
  do  
  #update only staff wich wasn't overwritten  
  if [ "${DB_NETWORK[${i}]}" != "*NULL*" ]  
  then  
  #create directory if not exist  
  if [ ! -d $(dirname ${SETTINGSPATH}/${x}) ]  
  then  
  install -d $(dirname ${SETTINGSPATH}/${x})  
  fi  
  echo "${DB_NETWORK[${i}]}" > ${SETTINGSPATH}/${x}  
   
  # theses fucking config functions:  
  # network gets only updated,  
  # if ${SETTINGS_TEMPLATE}/menu/network/networking exist  
  # so we force an update here  
  if [ ! -f ${SETTINGSPATH}/network/networking ]  
  then  
  [ ! -d ${SETTINGSPATH}/network ] && install -d ${SETTINGSPATH}/network  
  echo "${FIX_ME}" > ${SETTINGSPATH}/network/networking  
  fi  
   
  #set update flag  
  ALX_NETWORK_SETUP=true  
  fi  
  ((i++))  
  done  
 }  
   
   
   
 validate_xserver(){  
  #source /opt/alx-config/Configurator/config_functions.sh  
   
  local x i all LOCAL_XSERVER DB_XSERVER SETTINGSPATH  
   
  #all arrays:  
  # ->  xmodule resolution depth mouse monvendor monmodel hsync vref  
   
   #xserver  
  #get settings from local system  
  #vga  
  SETTINGSPATH=${SETTINGS_TEMPLATE}/system  
  declare -i i=0  
  for x in vga/vga \  
  vga/vgares \  
  vga/vgadepth  
  do  
  if [ -f ${SETTINGSPATH}/${x} ]  
  then  
  #file exist, then use content  
  LOCAL_XSERVER[${i}]="$(< ${SETTINGSPATH}/${x})"  
  else  
  LOCAL_XSERVER[${i}]=""  
  fi  
  ((i++))  
  done  
   
  #mouse  
  if [ -f ${SETTINGSPATH}/mouse/mouse ]  
  then  
  #file exist, then use content  
  LOCAL_XSERVER[3]="$(< ${SETTINGSPATH}/mouse/mouse)"  
  else  
  LOCAL_XSERVER[3]=""  
  fi  
   
  #monitor  
  local myvendor mymodel hsync vref  
  if [ -f ${SETTINGSPATH}/monitor/monitor ]  
  then  
  source ${SETTINGSPATH}/monitor/monitor  
   
  declare -i i=4  
  for x in "${myvendor}" \  
  "${mymodel}" \  
  "${hsync}" \  
  "${vref}"  
  do  
  LOCAL_XSERVER[${i}]="${x}"  
  ((i++))  
  done  
  else  
  LOCAL_XSERVER[4]=""  
  LOCAL_XSERVER[5]=""  
  LOCAL_XSERVER[6]=""  
  LOCAL_XSERVER[7]=""  
  fi  
   
   
  #get settings from database  
  all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  "select module,  
  resolution,  
  depth  
  from cfg_graphic where serial='${ALX_SERIAL}'")  
   
  #split'em up and put in an array  
  declare -i i=0  
  for x in ${all}  
  do  
  DB_XSERVER[${i}]=${x}  
  ((i++))  
  done  
   
  # read mouse  
  DB_XSERVER[3]=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  "select mouse from cfg_input where serial='${ALX_SERIAL}'")  
   
  #monitors  
 # all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select vendor,  
 # model,  
 # hsync,  
 # vrefresh  
 # from cfg_monitor where serial='${ALX_SERIAL}'")  
   
  all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
         "select vendor,  
  model,  
  hsync,  
  vrefresh  
  from list_monitors  
  inner join cfg_graphic  
  on cfg_graphic.monitorid=list_monitors.id;")  
   
  #split'em up and put in an array  
  declare -i i=4  
  for x in ${all}  
  do  
  DB_XSERVER[${i}]=${x}  
  ((i++))  
  done  
   
 # #now compare this stuff if they are equal  
 # for ((i=0; i < 8; i++))  
 # do  
 # if [ "${DB_XSERVER[${i}]}" = "${LOCAL_XSERVER[${i}]}" ]  
 # then  
 # echo "${i}: ${DB_XSERVER[${i}]} == ${LOCAL_XSERVER[${i}]}"  
 #  
 # #delete equal stuff from DB_NETWORK  
 # DB_XSERVER[${i}]="*NULL*"  
 #  
 # else  
 # echo "${i}: ${DB_XSERVER[${i}]} != ${LOCAL_XSERVER[${i}]}"  
 # fi  
 # done  
 #  
 #  
 # #update configs  
 # SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
 # #xserver general  
 # declare -i i=0  
 # for x in vga/vga \  
 # vga/vgares \  
 # vga/vgadepth \  
 # mouse/mouse  
 # do  
 # #update only staff wich wasn't overwritten  
 # if [ "${DB_XSERVER[${i}]}" != "*NULL*" ]  
 # then  
 # #create directory if not exist  
 # if [ ! -d $(dirname ${SETTINGSPATH}/${x}) ]  
 # then  
 # install -d $(dirname ${SETTINGSPATH}/${x})  
 # fi  
 # echo "${DB_XSERVER[${i}]}" > ${SETTINGSPATH}/${x}  
 # #set update flag  
 # ALX_XSERVER_SETUP=true  
 # fi  
 # ((i++))  
 # done  
 #  
 # #xserver monitors  
 # if [ "${DB_XSERVER[4]}" != "*NULL*" \  
 # -o "${DB_XSERVER[5]}" != "*NULL*" \  
 # -o "${DB_XSERVER[6]}" != "*NULL*" \  
 # -o "${DB_XSERVER[7]}" != "*NULL*" ]  
 # then  
 # if [ ! -d ${SETTINGSPATH}/monitor ]  
 # then  
 # install -d ${SETTINGSPATH}/monitor  
 # fi  
 # echo "myvendor=\"${DB_XSERVER[4]}\"" > ${SETTINGSPATH}/monitor/monitor  
 # echo "mymodel=\"${DB_XSERVER[5]}\"" >> ${SETTINGSPATH}/monitor/monitor  
 # echo "hsync=\"${DB_XSERVER[6]}\"" >> ${SETTINGSPATH}/monitor/monitor  
 # echo "vref=\"${DB_XSERVER[7]}\"" >> ${SETTINGSPATH}/monitor/monitor  
 #  
 # #set update flag  
 # ALX_XSERVER_SETUP=true  
 # fi  
   
  # - damn fucking setup_xfree routine need to rewrite this fucking stuff -  
  # setup_xfree will only run  
  # if ${SETTINGS_TEMPLATE}/menu/vga/vga exist  
  # so we must *always* update *all* settings if something has changed  
   
  #now compare this stuff if they are equal  
  for ((i=0; i < 8; i++))  
  do  
  if [ "${DB_XSERVER[${i}]}" = "${LOCAL_XSERVER[${i}]}" ]  
  then  
  echo "${i}: ${DB_XSERVER[${i}]} == ${LOCAL_XSERVER[${i}]}"  
   
  #delete equal stuff from DB_NETWORK  
  #DB_XSERVER[${i}]="*NULL*"  
   
  else  
  echo "${i}: ${DB_XSERVER[${i}]} != ${LOCAL_XSERVER[${i}]}"  
  fi  
  done  
   
  SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
  if [ "${DB_XSERVER[0]}" != "*NULL*" \  
  -o "${DB_XSERVER[1]}" != "*NULL*" \  
  -o "${DB_XSERVER[2]}" != "*NULL*" \  
  -o "${DB_XSERVER[3]}" != "*NULL*" \  
  -o "${DB_XSERVER[4]}" != "*NULL*" \  
  -o "${DB_XSERVER[5]}" != "*NULL*" \  
  -o "${DB_XSERVER[6]}" != "*NULL*" \  
  -o "${DB_XSERVER[7]}" != "*NULL*" ]  
  then  
  [ ! -d ${SETTINGSPATH}/vga ] && install -d ${SETTINGSPATH}/vga  
  [ ! -d ${SETTINGSPATH}/mouse ] && install -d ${SETTINGSPATH}/mouse  
  [ ! -d ${SETTINGSPATH}/monitor ] && install -d ${SETTINGSPATH}/monitor  
   
  echo "${DB_XSERVER[0]}" > ${SETTINGSPATH}/vga/vga  
  echo "${DB_XSERVER[1]}" > ${SETTINGSPATH}/vga/vgares  
  echo "${DB_XSERVER[2]}" > ${SETTINGSPATH}/vga/vgadepth  
  echo "${DB_XSERVER[3]}" > ${SETTINGSPATH}/mouse/mouse  
   
  echo "myvendor=\"${DB_XSERVER[4]}\"" > ${SETTINGSPATH}/monitor/monitor  
  echo "mymodel=\"${DB_XSERVER[5]}\"" >> ${SETTINGSPATH}/monitor/monitor  
  echo "hsync=\"${DB_XSERVER[6]}\"" >> ${SETTINGSPATH}/monitor/monitor  
  echo "vref=\"${DB_XSERVER[7]}\"" >> ${SETTINGSPATH}/monitor/monitor  
   
  #set update flag  
  ALX_XSERVER_SETUP=true  
  fi  
 }  
48    
49    
50  validate_sessions(){  validate_sessions(){
  #source /opt/alx-config/Configurator/config_functions.sh  
51    
52   local x i all LOCAL_SESSIONS DB_SESSIONS SETTINGSPATH count   local x i all LOCAL_SESSIONS DB_SESSIONS SETTINGSPATH count
53    
# Line 623  validate_sessions(){ Line 111  validate_sessions(){
111  }  }
112    
113    
114  validate_printing(){  update_system_settings(){
115   #source /opt/alx-config/Configurator/config_functions.sh   echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}
116    
117   local x i k all LOCAL_PRINTER DB_PRINTER SETTINGSPATH count   # imports network settings from db
118     config_networking
  #all arrays: [2 dimensions !]  
  # ->  name1 name2 ... nameN  
  # ->  name1 printingport ip share  
   
  #later on, for now -> name1 port1 ip1 share1 name2 ....  
  # seperator is 4  
   
  #local PRINTERNAME PRINTING IP SHARE  
   
  # update *always* printers from database;  
  # compare with local settings cannot be done yet  
   
  #get settings from database  
  all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  "select printer_name,  
  port,  
  ip,  
  share  
  from cfg_printers where serial='${ALX_SERIAL}'")  
   
  #split'em up and put in an array  
  declare -i i=0  
  declare -i k=0  
   
  if [ -n "${all}" ]  
  then  
  for x in ${all}  
  do  
  ((k++))  
  DB_PRINTER[${i}]="${DB_PRINTER[${i}]} ${x}"  
  if [ ${k} -eq 4 ]  
  then  
  ((i++))  
  #reset $k  
  declare -i k=0  
  fi  
  done  
  count=${i}  
  else  
  count=0  
  fi  
   
  #echo settings  
  echo "Number of new printers: ${count}"  
  for ((i=0; i < count; i++))  
  do  
  echo "${i} printer:"  
  for x in ${DB_PRINTER[${i}]}  
  do  
  echo "    ${x}"  
  done  
  done  
   
  #import settings (only if counter > 0)  
  local prnset  
   
  #delete all printers (*always*)  
  if [ -d ${SETTINGS_TEMPLATE}/system/printing ]  
  then  
  SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
  [ -d ${SETTINGSPATH}/delete ] && rm -rf ${SETTINGSPATH}/delete  
  install -d ${SETTINGSPATH}/delete  
  mv -f ${SETTINGS_TEMPLATE}/system/printing/* ${SETTINGSPATH}/delete  
  rm -rf ${SETTINGS_TEMPLATE}/system/printing  
   
  #set update flag (*always*)  
  ALX_PRINTER_SETUP=true  
  fi  
   
  if [ ${count} -gt 0 ]  
  then  
  SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
   
  [ ! -d ${SETTINGSPATH}/printing ] && install -d ${SETTINGSPATH}/printing  
  for ((i=0; i < count; i++))  
  do  
  declare -i k=0  
  for x in ${DB_PRINTER[${i}]}  
  do  
  prnset[${k}]=${x}  
  ((k++))  
  done  
   
  echo "PRINTERNAME=${prnset[0]}" >  ${SETTINGSPATH}/printing/${prnset[0]}  
  echo "PRINTING=${prnset[1]}" >> ${SETTINGSPATH}/printing/${prnset[0]}  
  echo "IP=${prnset[2]}" >> ${SETTINGSPATH}/printing/${prnset[0]}  
  echo "SHARE=${prnset[3]}" >> ${SETTINGSPATH}/printing/${prnset[0]}  
  done  
   
  #set update flag (*always*)  
  ALX_PRINTER_SETUP=true  
  fi  
   
 }  
119    
120  update_system_settings(){   # imports x11 settings from db
121   source /opt/alx-config/Configurator/config_functions.sh   config_x11
122    
  echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}  
   
  echo  
  echo "network"  
  validate_networking  
  echo  
  echo "xserver"  
  validate_xserver  
  echo  
  echo "sessions"  
  validate_sessions  
  echo  
  #echo "printers"  
  #validate_printing  
123   #echo   #echo
124     #echo "sessions"
125   if [ "${ALX_NETWORK_SETUP}" == "true" ]   #validate_sessions
126   then   #echo
127   echo -e ${COLMAGENTA}"Updating network settings"${COLDEFAULT}   config_sessions
128   setup_modules  
129   setup_network   # imports printer settings from db
130   fi   config_printing
   
  if [ "${ALX_XSERVER_SETUP}" == "true" ]  
  then  
  echo -e ${COLMAGENTA}"Updating xserver settings"${COLDEFAULT}  
  setup_xfree  
  fi  
   
  if [ "${ALX_SESSION_SETUP}" == "true" ]  
  then  
  echo -e ${COLMAGENTA}"Updating session settings"${COLDEFAULT}  
  setup_sessions  
  fi  
   
  #if [ "${ALX_PRINTER_SETUP}" == "true" ]  
  #then  
  # echo -e ${COLMAGENTA}"Updating printer settings"${COLDEFAULT}  
  # setup_printers  
  #fi  
   
  #clean up temp files  
  local SETTINGSPATH  
  SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
  #[ -d ${SETTINGSPATH} ] && rm -rf ${SETTINGSPATH}  
131  }  }
132    
133  get_system_serial(){  get_system_serial(){
# Line 778  get_system_serial(){ Line 135  get_system_serial(){
135   local CUR_IP CUR_MAC CUR_MTIME   local CUR_IP CUR_MAC CUR_MTIME
136    
137   #check if serial file exists   #check if serial file exists
138   if [ -f /etc/alx-config/serial ]   if [ -f /etc/alxconfig-ng/serial ]
139   then   then
140   source /etc/alx-config/serial   source /etc/alxconfig-ng/serial
141    
142   # if system is already configured, it *has* a hostname.   #start preliminary networking (dhcp)
  # so we take the hostname of this system here  
  source /etc/hostname  
   
  #start preliminary networking (dhcp)  
143   preliminary_network start   preliminary_network start
144    
145   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
146   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
147   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
148    
149   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
150    
151   #nice serial output   #nice serial output
152   $CURS_UP   $CURS_UP
153   $SET_WCOL   $SET_WCOL
154   echo "[ SN: ${ALX_SERIAL} ]"   echo "[ SN: ${ALX_SERIAL} ]"
   
 # #is this system outdated ?  
 # #MY_HOSTNAME=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # # "select hostname from cfg_serial where id='${ALX_SERIAL}'")  
 #  
 # #we do this now with the date instead of the hostname  
 # local MY_ALX_REG_DATE  
 # MY_ALX_REG_DATE=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select mtime from client_serial where serial='${ALX_SERIAL}'")  
 #  
 # #if [ "${MY_HOSTNAME}" == "${HOSTNAME}" ]  
 # if [ "${MY_ALX_REG_DATE}" == "${ALX_REG_DATE}" ]  
 # then  
 # #set ALX_STATE to ok so everybody that everything was ok  
 # ALX_STATE=ok  
 #  
 # evaluate_retval  
 # else  
 # #print false (works only if this is the first statement here)  
 # evaluate_retval  
 #  
 # #set ALX_STATE to error so everybody sees there was an error  
 # ALX_STATE=error  
 # fi  
155    
156   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
157   then   then
# Line 837  get_system_serial(){ Line 166  get_system_serial(){
166   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
167   ALX_HW_DETECT=true   ALX_HW_DETECT=true
168   /etc/init.d/hwdetect start   /etc/init.d/hwdetect start
169    
170   #set hostname to alx_default_hostname   #set hostname to alx_default_hostname
171   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
172   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
173    
174   #update the hostname on the system for sure   #update the hostname on the system for sure
175   echo "HOSTNAME=${HOSTNAME}" > /etc/hostname   echo "${HOSTNAME}" > /etc/hostname
176    
177   #start preliminary networking (dhcp)   #start preliminary networking (dhcp)
178   preliminary_network start   preliminary_network start
179    
180   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
181   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
182   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
183    
184   echo -e ${COLOREDSTAR} "Trying to get new serial ..."   echo -e ${COLOREDSTAR} "Trying to get new serial ..."
185    
186   #request new serial   #request new serial
187   #ALX_REG_DATE="$(date +%F)"   #ALX_REG_DATE="$(date +%F)"
188    
189   #we're using the mtime now (better for vaildating the serial)   #we're using the mtime now (better for vaildating the serial)
190   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
191   "insert into client_serials(   "insert into client_serials(
# Line 867  get_system_serial(){ Line 196  get_system_serial(){
196   '${CUR_MTIME}',   '${CUR_MTIME}',
197   '${CUR_MAC}'   '${CUR_MAC}'
198   );"   );"
199    
200   #then validate and retrieve serial   #then validate and retrieve serial
201    
202   ### warning must be changed that only the LAST ID will be fetched,  ###   ### warning must be changed that only the LAST ID will be fetched,  ###
203   ### 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     ###
204   ### you have more then one serial number than                       ###   ### you have more than one serial number then                       ###
205    
  #not 100% working may get more than *one* id  
  #ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  # "select id from cfg_serial where datum='${ALX_REG_DATE}' and hostname='${HOSTNAME}'")  
   
206   #select highest id only (added max)   #select highest id only (added max)
207   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
208   "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}'")
# Line 888  get_system_serial(){ Line 213  get_system_serial(){
213   $CURS_UP   $CURS_UP
214   $SET_WCOL   $SET_WCOL
215   echo "[ SN: ${ALX_SERIAL} ]"   echo "[ SN: ${ALX_SERIAL} ]"
216    
217   #set ALX_STATE to ok so everybody that everything was ok   #set ALX_STATE to ok so everybody that everything was ok
218   ALX_STATE=ok   ALX_STATE=ok
219    
220   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alx-config/serial   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial
221   echo "ALX_REG_DATE=${CUR_MTIME}" >> /etc/alx-config/serial   echo "ALX_REG_DATE=${CUR_MTIME}" >> /etc/alxconfig-ng/serial
222    
223   evaluate_retval   evaluate_retval
224   else   else
225   #print false (works only if this is the first statement here)   #print false (works only if this is the first statement here)
226   evaluate_retval   evaluate_retval
227    
228   #set ALX_STATE to error so everybody sees there was an error   #set ALX_STATE to error so everybody sees there was an error
229   ALX_STATE=error   ALX_STATE=error
230    
231   #show an error that no new serial was found   #show an error that no new serial was found
232   #nice serial output   #nice serial output
233   $CURS_UP   $CURS_UP
# Line 910  get_system_serial(){ Line 235  get_system_serial(){
235   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"
236   fi   fi
237   fi   fi
238    
239   #write current state to temp file   #write current state to temp file
240   echo "ALX_STATE=${ALX_STATE}" > /etc/alx-config/state/state   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
241  }  }
242    
243    
244  check_is_configured() {  check_is_configured() {
245   if [ -f /etc/alx-config/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
246   then   then
247   export ALX_CONFIGURED=true   export ALX_CONFIGURED=true
248   else   else
# Line 930  check_is_configured() { Line 255  check_is_configured() {
255  import_settings_to_db() {  import_settings_to_db() {
256   #note: networking is always 'dhcp' if hw was autodetected   #note: networking is always 'dhcp' if hw was autodetected
257   #note: default_domain/hostname is set in config.rc   #note: default_domain/hostname is set in config.rc
258    
259   #to be safe, we do some sanity checks   #to be safe, we do some sanity checks
260   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
261   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
262    
263   #vars used by hwdetect   #vars used by hwdetect
264   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
265   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
266   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
267    
268   #get setting from hwdetect   #get setting from hwdetect
269   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
270   source /etc/sysconfig/hwsetup/mouse   source /etc/sysconfig/hwsetup/mouse
271    
272   echo   echo
273   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
274    
275   #network   #network
276   echo -e "      Network settings ..."   echo -e "      Network settings ..."
277   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
# Line 965  import_settings_to_db() { Line 290  import_settings_to_db() {
290   'dhcp'   'dhcp'
291   );"   );"
292   evaluate_retval   evaluate_retval
293    
294   #xserver   #xserver
295   echo -e "      Graphic settings ..."   echo -e "      Graphic settings ..."
296   #xserver general   #xserver general
# Line 974  import_settings_to_db() { Line 299  import_settings_to_db() {
299   serial,   serial,
300   module,   module,
301   resolution,   resolution,
302   depth   depth,
303     monitorid
304   )   )
305   values(   values(
306   '${ALX_SERIAL}',   '${ALX_SERIAL}',
307   '${XMODULE}',   '${XMODULE}',
308   '1024x768',   '1024x768',
309   '16'   '16',
310     '0'
311   );";   );";
312   #xserver monitor  
   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  "insert into cfg_monitor(  
  serial,  
  vendor,  
  model,  
  hsync,  
  vrefresh  
  )  
  values(  
  '${ALX_SERIAL}',  
  'Aamazing',  
  'CM-1528-FS',  
  '28-64',  
  '47-104'  
  );";  
   
313   # input   # input
314    mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \    mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
315   "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');";)   "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');";)
# Line 1006  import_settings_to_db() { Line 317  import_settings_to_db() {
317  }  }
318    
319  # imports current settings to the local system resolved by the hardware detection  # imports current settings to the local system resolved by the hardware detection
320    # we only need the network settings
321  import_settings_local(){  import_settings_local(){
322   #note: networking is always 'dhcp' if hw was autodetected   #note: networking is always 'dhcp' if hw was autodetected
323   #note: default_domain/hostname is set in config.rc   #note: default_domain/hostname is set in config.rc
324    
325   #to be safe, we do some sanity checks   #to be safe, we do some sanity checks
326   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
327   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
328    
329   #vars used by hwdetect   #vars used by hwdetect
330   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
331   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
332   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
333    
   
334   #get setting from hwdetect   #get setting from hwdetect
335   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
336   source /etc/sysconfig/hwsetup/mouse  
   
337   echo   echo
338   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}
339    
340     [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
341   #allready configured, no update needed so we put it to system   echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
  SETTINGSPATH=${SETTINGS_TEMPLATE}/system  
   
   
  #network  
  echo -e "      Network settings ..."  
   
  [ ! -d ${SETTINGSPATH}/modules ] && install -d ${SETTINGSPATH}/modules  
  echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules/modules  
   
  [ ! -d ${SETTINGSPATH}/network ] && install -d ${SETTINGSPATH}/network  
  ( echo "${ALX_DEFAULT_HOSTNAME}" > ${SETTINGSPATH}/network/hostname;  
   echo "${ALX_DEFAULT_DOMAIN}" > ${SETTINGSPATH}/network/domain;  
   echo "dhcp" > ${SETTINGSPATH}/network/networking )  
342   evaluate_retval   evaluate_retval
343    
   
  #xserver  
  echo -e "      Graphic settings ..."  
   
  [ ! -d ${SETTINGSPATH}/vga ] && install -d ${SETTINGSPATH}/vga  
  [ ! -d ${SETTINGSPATH}/mouse ] && install -d ${SETTINGSPATH}/mouse  
  [ ! -d ${SETTINGSPATH}/monitor ] && install -d ${SETTINGSPATH}/monitor  
  ( echo "${XMODULE}" > ${SETTINGSPATH}/vga/vga;  
   echo "16" > ${SETTINGSPATH}/vga/vgadepth;  
   echo "1024x768" > ${SETTINGSPATH}/vga/vgares;  
   echo "${XMOUSETYPE}" > ${SETTINGSPATH}/mouse/mouse;  
   echo "myvendor=\"Aamazing\"" > ${SETTINGSPATH}/monitor/monitor;  
   echo "mymodel=\"CM-1528-FS\"" >> ${SETTINGSPATH}/monitor/monitor;  
   echo "hsync=\"28-64\"" >> ${SETTINGSPATH}/monitor/monitor;  
   echo "vref=\"47-104\"" >> ${SETTINGSPATH}/monitor/monitor;)  
  evaluate_retval  
   
344   #set system state to 'already configured'   #set system state to 'already configured'
345   touch /etc/alx-config/state/configured   touch /etc/alxconfig-ng/state/configured
346  }  }
347    
348  #start|stop  #start|stop
349  preliminary_network(){  preliminary_network(){
350   local module   local module
351    
352   if [ -f /etc/alx-config/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
353   then   then
354   #get module name   #get module name
355   module=$(cat ${SETTINGS_TEMPLATE}/system/modules/modules)   module=$(cat ${SETTINGSPATH}/modules)
356   modprobe ${module}   modprobe ${module}
357   else   else
358   #vars used by hwdetect   #vars used by hwdetect
359   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
360   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
361    
362   #get setting from hwdetect   #get setting from hwdetect
363   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
364   modprobe ${NETCARD_DRIVER}   modprobe ${NETCARD_DRIVER}
365   fi   fi
366    
367   case $1 in   case $1 in
368   start)   start)
369   # keeping like always safe:   # keeping like always safe:
# Line 1097  preliminary_network(){ Line 377  preliminary_network(){
377   else   else
378   rm -f /var/run/dhcpcd-eth?.pid   rm -f /var/run/dhcpcd-eth?.pid
379   fi   fi
380    
381   echo -e ${COLMAGENTA}"Starting preliminary network ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Starting preliminary network ... "${COLDEFAULT}
382   #dhcpcd &> /dev/null #&& echo "ok" || echo "false"   dhcpcd &> /dev/null
383    
384   # aka_fix ########################################   # aka_fix ########################################
385   ifconfig eth0 128.20.222.222 netmask 255.255.0.0 up   #ifconfig eth0 128.20.222.222 netmask 255.255.0.0 up
386   route del default gw 128.20.50.13 &> /dev/null   #route del default gw 128.20.50.13 &> /dev/null
387   route add default gw 128.20.50.21 &> /dev/null   #route add default gw 128.20.50.21 &> /dev/null
388   echo "nameserver 128.20.50.21" > /etc/resolv.conf   #echo "nameserver 128.20.50.21" > /etc/resolv.conf
389   ##################################################   ##################################################
390    
391   evaluate_retval   evaluate_retval
392   ;;   ;;
393    
394   stop)   stop)
395   echo -e ${COLMAGENTA}"Stopping preliminary network ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Stopping preliminary network ... "${COLDEFAULT}
396   ifconfig eth0 down   ifconfig eth0 down
397   if ps -A|grep dhcpcd > /dev/null   if ps -A|grep dhcpcd > /dev/null
398   then   then
  #echo -en ${COLMAGENTA}"Stopping preliminary network ... "${COLDEFAULT}  
399   dhcpcd -z  &> /dev/null   dhcpcd -z  &> /dev/null
400   fi   fi
401   evaluate_retval   evaluate_retval
402   ;;   ;;
403    
404   *)   *)
405   echo "Usage: preliminary_network {start|stop}"   echo "Usage: preliminary_network {start|stop}"
406   ;;   ;;
# Line 1146  case $1 in Line 428  case $1 in
428   stop)   stop)
429   #unset_alx_connected #--> now in alxsetstate-rc6   #unset_alx_connected #--> now in alxsetstate-rc6
430   # ! important !: del systemstate   # ! important !: del systemstate
431   [ -f /etc/alx-config/state/state ] && rm /etc/alx-config/state/state   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
432   sleep 0.1   sleep 0.1
433   ;;   ;;
434   *)   *)

Legend:
Removed from v.221  
changed lines
  Added in v.239