Magellan Linux

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

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

alx-src/branches/alxconf_20060908/alxconfig-ng/init.d/alxsettings revision 543 by niro, Wed Feb 4 19:51:39 2009 UTC alx-src/branches/alxconf-060/init.d/alxsettings revision 1976 by niro, Sat May 7 11:07:31 2011 UTC
# Line 1  Line 1 
1  #!/bin/bash  #!/bin/bash
2    # $Id$
3  # <niro@magellan-linux.de>  # <niro@magellan-linux.de>
4    
5  #%rlevels: 7:s 0:k 6:k  #%rlevels: 7:s 0:k 6:k
# Line 11  Line 11 
11  #%before:  #%before:
12  #%after:  #%after:
13    
 # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.27 2005-10-11 12:10:15 niro Exp $  
   
14  # 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
15  # if not it runs the autoconfiguration script  # if not it runs the autoconfiguration script
16  # these settings will be used for client setup  # these settings will be used for client setup
# Line 21  Line 19 
19  # 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.
20  # the server settings has higher priority.  # the server settings has higher priority.
21    
22  source /etc/sysconfig/rc  source /etc/conf.d/rc
23  source $rc_functions  source $rc_functions
24    
25  # mysql settings  # mysql settings
# Line 37  source /usr/lib/alxconfig-ng/functions/c Line 35  source /usr/lib/alxconfig-ng/functions/c
35  source /usr/lib/alxconfig-ng/functions/config_x11  source /usr/lib/alxconfig-ng/functions/config_x11
36  source /usr/lib/alxconfig-ng/functions/config_auth  source /usr/lib/alxconfig-ng/functions/config_auth
37  source /usr/lib/alxconfig-ng/functions/config_ssh_auth  source /usr/lib/alxconfig-ng/functions/config_ssh_auth
38    source /usr/lib/alxconfig-ng/functions/config_versions
 # check if mysql is available  
 [ -x /usr/bin/mysql ] && MYSQL_ALX=true  
39    
40  # other needed vars  # other needed vars
41  ALX_HW_DETECT=false  ALX_HW_DETECT=false
# Line 93  update_system_settings() Line 89  update_system_settings()
89    
90   # exchange ssh rsa keys   # exchange ssh rsa keys
91   HOME=/root config_ssh_auth   HOME=/root config_ssh_auth
92    
93     # import version info
94     config_version
95  }  }
96    
97  get_system_serial()  get_system_serial()
# Line 122  get_system_serial() Line 121  get_system_serial()
121   exit 1   exit 1
122   fi   fi
123    
124   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
125   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
126   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
127    
128   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
# Line 139  get_system_serial() Line 138  get_system_serial()
138   else   else
139   # abort on non valid serial   # abort on non valid serial
140   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
141   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
142   show_invalid_serial_msg   show_invalid_serial_msg
143   exit 1   exit 1
144   fi   fi
# Line 150  get_system_serial() Line 149  get_system_serial()
149   if [[ ${ALX_FORCED_RECHECK} = true ]]   if [[ ${ALX_FORCED_RECHECK} = true ]]
150   then   then
151   echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}   echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
152     # always disable CONFD_NETWORKING here
153     export ALX_CONFD_NETWORKING="false"
154   else   else
155   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
156   fi   fi
# Line 205  get_system_serial() Line 206  get_system_serial()
206   fi   fi
207    
208   # write current state to temp file   # write current state to temp file
209   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
210   [ -f /hardware-auto-detection ] && rm /hardware-auto-detection   [ -f /hardware-auto-detection ] && rm /hardware-auto-detection
211    
212   # now export ALX_FORCED_RECHECK=true   # now export ALX_FORCED_RECHECK=true
# Line 230  get_system_serial() Line 231  get_system_serial()
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
233    
234   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial   echo "ALX_SERIAL=\"${ALX_SERIAL}\"" > /etc/alxconfig-ng/serial
235   echo "ALX_REG_DATE=${CUR_MTIME}" >> /etc/alxconfig-ng/serial   echo "ALX_REG_DATE=\"${CUR_MTIME}\"" >> /etc/alxconfig-ng/serial
236    
237   evaluate_retval   evaluate_retval
238   else   else
# Line 250  get_system_serial() Line 251  get_system_serial()
251   fi   fi
252    
253   # write current state to temp file   # write current state to temp file
254   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state
255   echo "ALX_IFACE=${ALX_IFACE}" >> /etc/alxconfig-ng/state/state   echo "ALX_IFACE=\"${ALX_IFACE}\"" >> /etc/alxconfig-ng/state/state
256  }  }
257    
258    
# Line 377  import_settings_to_db() Line 378  import_settings_to_db()
378   module,   module,
379   resolution,   resolution,
380   depth,   depth,
381   monitorid   refresh_rate
382   )   )
383   values(   values(
384   '${ALX_SERIAL}',   '${ALX_SERIAL}',
385   '${XMODULE}',   '${XMODULE}',
386   '1024x768',   '1024x768',
387   '16',   '16',
388   '0'   '60'
389   );"; )   );"; )
390   evaluate_retval   evaluate_retval
391    
# Line 427  import_settings_to_db() Line 428  import_settings_to_db()
428   echo -e "      Screensaver settings ..."   echo -e "      Screensaver settings ..."
429   mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"   mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
430    
431     # version info
432     local alx_os
433     local alx_utils
434     alx_os="$(< /etc/mageversion)"
435     alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
436     alx_utils="${alx_utils/alxconfig-ng-alx-}"
437     mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
438    
439   evaluate_retval   evaluate_retval
440  }  }
441    
# Line 509  update_settings_in_db() Line 518  update_settings_in_db()
518   module='${XMODULE}',   module='${XMODULE}',
519   resolution='1024x768',   resolution='1024x768',
520   depth='16',   depth='16',
521   monitorid='0'   refresh_rate='60'
522   where serial=${ALX_SERIAL};"   where serial=${ALX_SERIAL};"
523   evaluate_retval   evaluate_retval
524    
# Line 517  update_settings_in_db() Line 526  update_settings_in_db()
526   echo -e "      Input settings ..."   echo -e "      Input settings ..."
527   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"
528   evaluate_retval   evaluate_retval
529    
530     # version info
531     local alx_os
532     local alx_utils
533     alx_os="$(< /etc/mageversion)"
534     alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
535     alx_utils="${alx_utils/alxconfig-ng-alx-}"
536     mysqldo "update client_version set os='${alx_os}', utils='${alx_utils}' where serial=${ALX_SERIAL};"
537  }  }
538    
539  # imports current settings to the local system resolved by the hardware detection  # imports current settings to the local system resolved by the hardware detection
# Line 546  import_settings_local() Line 563  import_settings_local()
563   #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}   #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
564   #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules   #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
565    
566   # set an device alias for modprobe.conf   # set an device alias for modprobe.conf and modules.conf
567   [ ! -d /etc/modules.d ] && install -d /etc/modules.d   [ ! -d /etc/modules.d ] && install -d /etc/modules.d
568     [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
569   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0
570     echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0
571    
572   # regenerate modprobe.conf   # regenerate modprobe.conf
573   [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"   [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"
# Line 558  import_settings_local() Line 577  import_settings_local()
577   # set system state to 'already configured'   # set system state to 'already configured'
578   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
579    
580     # install slim desktopmanager configuration
581     config_display_manager
582    
583   # if only an recheck was forced than abort now   # if only an recheck was forced than abort now
584   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0
585    
# Line 645  import_settings_local() Line 667  import_settings_local()
667  preliminary_network()  preliminary_network()
668  {  {
669   local module   local module
670     local modulesconf
671    
672   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
673   then   then
# Line 655  preliminary_network() Line 678  preliminary_network()
678   module=$(cat ${SETTINGSPATH}/modules)   module=$(cat ${SETTINGSPATH}/modules)
679   modprobe ${module}   modprobe ${module}
680   fi   fi
681    
682     # check modprobe.conf
683     if [[ $(kernel_major_version) = 2.4 ]]
684     then
685     modulesconf="/etc/modules.conf"
686     else
687     modulesconf="/etc/modprobe.conf"
688     fi
689     if [[ -z $(grep eth0 ${modulesconf}) ]]
690     then
691     modules-update force
692     fi
693   else   else
694   # vars used by hwdetect   # vars used by hwdetect
695   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
# Line 707  preliminary_network() Line 742  preliminary_network()
742   if ps -A|grep dhcpcd > /dev/null   if ps -A|grep dhcpcd > /dev/null
743   then   then
744   dhcpcd -z  &> /dev/null   dhcpcd -z  &> /dev/null
745     sleep 1
746   fi   fi
747   evaluate_retval   evaluate_retval
748   ;;   ;;

Legend:
Removed from v.543  
changed lines
  Added in v.1976