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/trunk/alxconfig-ng/init.d/alxsettings revision 314 by niro, Wed Aug 31 23:55:22 2005 UTC alx-src/branches/alxconf-060/init.d/alxsettings revision 3466 by niro, Fri Apr 13 17:27:25 2012 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  #%start: 41  #%start: 41
7  #%stop: 01  #%stop: 01
8    
# 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.20 2005-08-31 23:55:22 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
26  source /etc/alxconfig-ng/config.rc  source /etc/alxconfig-ng/config.rc
27    
28  # helper functions  # helper functions
29  source /usr/lib/alxconfig-ng/functions/mysqlfunctions  source ${ALX_FUNCTIONS}/common
30  source /usr/lib/alxconfig-ng/functions/serial_functions  source ${ALX_FUNCTIONS}/mysqlfunctions
31  source /usr/lib/alxconfig-ng/functions/config_modules  source ${ALX_FUNCTIONS}/serial_functions
32  source /usr/lib/alxconfig-ng/functions/config_network  source ${ALX_FUNCTIONS}/config_modules
33  source /usr/lib/alxconfig-ng/functions/config_printers  source ${ALX_FUNCTIONS}/config_plugins
34  source /usr/lib/alxconfig-ng/functions/config_sessions  source ${ALX_FUNCTIONS}/config_network
35  source /usr/lib/alxconfig-ng/functions/config_x11  source ${ALX_FUNCTIONS}/config_printers
36  source /usr/lib/alxconfig-ng/functions/config_auth  source ${ALX_FUNCTIONS}/config_sessions
37  source /usr/lib/alxconfig-ng/functions/config_ssh_auth  source ${ALX_FUNCTIONS}/config_x11
38    source ${ALX_FUNCTIONS}/config_auth
39  # check if mysql is available  source ${ALX_FUNCTIONS}/config_ssh_auth
40  [ -x /usr/bin/mysql ] && MYSQL_ALX=true  source ${ALX_FUNCTIONS}/config_versions
41    
42  # other needed vars  # other needed vars
43  ALX_HW_DETECT=false  ALX_HW_DETECT=false
44  ALX_FORCED_RECHECK=false  ALX_FORCED_RECHECK=false
45    ALX_RESET_SETTINGS=false
46    ALX_CONFD_NETWORKING=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
# Line 52  unset ALX_SERIAL ALX_STATE Line 52  unset ALX_SERIAL ALX_STATE
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    update_system_settings()
56  update_system_settings(){  {
57   echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}   rc_mecho Checking system setup ...
58    
59   # get the modules settings   # get the modules settings
60   # ! is the first thing that must be configured !   # ! is the first thing that must be configured !
61   config_modules   config_modules
62    
63     # install or uninstall plugins
64     config_plugins
65    
66   # imports network settings from db   # imports network settings from db
67   config_networking   config_networking
68    
# Line 77  update_system_settings(){ Line 80  update_system_settings(){
80    
81   # exchange ssh rsa keys   # exchange ssh rsa keys
82   HOME=/root config_ssh_auth   HOME=/root config_ssh_auth
83    
84     # import version info
85     config_version
86  }  }
87    
88  get_system_serial(){  get_system_serial()
89    {
90     local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE CONFIG
91    
92   local CUR_IP CUR_MAC CUR_MTIME   if [[ ${ALX_CONFD_NETWORKING} = true ]]
93     then
94     ALX_IFACE="$(< ${SETTINGSPATH}/confd-networking)"
95     else
96     ALX_IFACE="eth0"
97     fi
98    
99   # check if serial file exists   # check if serial file exists
100   if [ -f /etc/alxconfig-ng/serial ] && [ ! -f /hardware-auto-detection ]   if [ -f /etc/alxconfig-ng/serial ] && [[ ${ALX_FORCED_RECHECK} = false ]]
101   then   then
102   source /etc/alxconfig-ng/serial   source /etc/alxconfig-ng/serial
103    
# Line 99  get_system_serial(){ Line 112  get_system_serial(){
112   exit 1   exit 1
113   fi   fi
114    
115   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
116   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
117   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
118    
119   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   rc_print "Trying to validate my serial ..."
120    
121   # nice serial output   # nice serial output
122   $CURS_UP   $CURS_UP
# Line 116  get_system_serial(){ Line 129  get_system_serial(){
129   else   else
130   # abort on non valid serial   # abort on non valid serial
131   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
132   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
133     clearconfig
134     addconfig "ALX_STATE=\"${ALX_STATE}\""
135   show_invalid_serial_msg   show_invalid_serial_msg
136   exit 1   exit 1
137   fi   fi
# Line 124  get_system_serial(){ Line 139  get_system_serial(){
139   else   else
140   # run hardware detection   # run hardware detection
141   echo   echo
142   if [ -f /hardware-auto-detection ]   if [[ ${ALX_FORCED_RECHECK} = true ]]
143   then   then
144   echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}   rc_mecho "Hardware autodetection forced by system-administrator"
145     # always disable CONFD_NETWORKING here
146     export ALX_CONFD_NETWORKING="false"
147   else   else
148   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   rc_mecho "Preparing system for first boot"
149   fi   fi
150   ALX_HW_DETECT=true   ALX_HW_DETECT=true
151   /etc/init.d/hwdetect start   hwsetup
152    
153   # set hostname to alx_default_hostname   # set hostname to alx_default_hostname
154   # use old hostname if this is a forced re-check   # use old hostname if this is a forced re-check
155   [ -f /hardware-auto-detection ] && ALX_DEFAULT_HOSTNAME="$(< /etc/hostname)"   [[ ${ALX_FORCED_RECHECK} = true ]] && ALX_DEFAULT_HOSTNAME="$(< /etc/hostname)"
156   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
157   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
158    
159   # update the hostname on the system for sure   # update the hostname on the system for sure
160   echo "${HOSTNAME}" > /etc/hostname   CONFIG="/etc/hostname"
161     clearconfig
162     addconfig "${HOSTNAME}"
163    
164   # start preliminary networking (dhcp)   # start preliminary networking (dhcp)
165   preliminary_network start   preliminary_network start
# Line 153  get_system_serial(){ Line 172  get_system_serial(){
172   exit 1   exit 1
173   fi   fi
174    
175   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
176   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
177   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
178    
179   # abort now if this is a forced re-check   # abort now if this is a forced re-check
180   if [ -f /hardware-auto-detection ]   if [[ ${ALX_FORCED_RECHECK} = true ]]
181   then   then
182   # but first check the serial   # but first check the serial
183   source /etc/alxconfig-ng/serial   source /etc/alxconfig-ng/serial
184    
185   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   rc_print "Trying to validate my serial ..."
186    
187   # nice serial output   # nice serial output
188   $CURS_UP   $CURS_UP
# Line 176  get_system_serial(){ Line 195  get_system_serial(){
195   else   else
196   # abort on non valid serial   # abort on non valid serial
197   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
198   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
199     clearconfig
200     addconfig "ALX_STATE=\"${ALX_STATE}\""
201   show_invalid_serial_msg   show_invalid_serial_msg
202   exit 1   exit 1
203   fi   fi
204    
205   # write current state to temp file   # write current state to temp file
206   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
207   rm /hardware-auto-detection   clearconfig
208     addconfig "ALX_STATE=\"${ALX_STATE}\""
209     [ -f /hardware-auto-detection ] && rm /hardware-auto-detection
210    
211   # now export ALX_FORCED_RECHECK=true   # now export ALX_FORCED_RECHECK=true
212   # that the setting will be updated not inserted !   # that the setting will be updated not inserted !
# Line 191  get_system_serial(){ Line 214  get_system_serial(){
214   return 0   return 0
215   fi   fi
216    
217   echo -e ${COLOREDSTAR} "Trying to get new serial ..."   rc_print "Trying to get new serial ..."
   
  # request new serial  
  # ALX_REG_DATE="$(date +%F)"  
   
  # we're using the mtime now (better for validating the serial)  
 # mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "insert into client_serials(  
 # mtime,  
 # mac  
 # )  
 # values(  
 # '${CUR_MTIME}',  
 # '${CUR_MAC}'  
 # );"  
 #  
 # # then validate and retrieve serial  
 #  
 # ### warning must be changed that only the LAST ID will be fetched,  ###  
 # ### or you get error if the computer name and date are the same     ###  
 # ### you have more than one serial number then                       ###  
 #  
 # # select highest id only (added max)  
 # ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
 # "select max(serial) from client_serials where mtime='${CUR_MTIME}' and mac='${CUR_MAC}'")  
218    
219   # request a new serial; one command now (cause must be done in the same session)   # request a new serial; one command now (cause must be done in the same session)
220   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ALX_SERIAL=$(mysqldo "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');
  "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');  
221   select last_insert_id();")   select last_insert_id();")
222    
223   if [ "${ALX_SERIAL}" != NULL ]   if [[ ${ALX_SERIAL} != NULL ]]
224   then   then
225   # nice serial output   # nice serial output
226   $CURS_UP   $CURS_UP
227   $SET_WCOL   $SET_WCOL
228   echo "[ SN: ${ALX_SERIAL} ]"   echo "[ SN: ${ALX_SERIAL} ]"
229    
230   # set ALX_STATE to ok so everybody that everything was ok   # set ALX_STATE to ok so everybody knows that everything was ok
231   ALX_STATE=ok   ALX_STATE=ok
232    
233   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial   CONFIG="/etc/alxconfig-ng/serial"
234   echo "ALX_REG_DATE=${CUR_MTIME}" >> /etc/alxconfig-ng/serial   clearconfig
235     addconfig "ALX_SERIAL=\"${ALX_SERIAL}\""
236     addconfig "ALX_REG_DATE=\"${CUR_MTIME}\""
237    
238   evaluate_retval   evaluate_retval
239   else   else
# Line 252  get_system_serial(){ Line 252  get_system_serial(){
252   fi   fi
253    
254   # write current state to temp file   # write current state to temp file
255   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
256     clearconfig
257     addconfig "ALX_STATE=\"${ALX_STATE}\""
258     addconfig "ALX_IFACE=\"${ALX_IFACE}\""
259  }  }
260    
261    
262  check_is_configured() {  check_is_configured()
263    {
264   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
265   then   then
266   export ALX_CONFIGURED=true   export ALX_CONFIGURED=true
# Line 267  check_is_configured() { Line 271  check_is_configured() {
271    
272    
273  # imports current settings to the database resolved by the hardware detection  # imports current settings to the database resolved by the hardware detection
274  import_settings_to_db() {  import_settings_to_db()
275    {
276   # note: networking is always 'dhcp' if hw was autodetected   # note: networking is always 'dhcp' if hw was autodetected
277   # note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
278    
# Line 275  import_settings_to_db() { Line 280  import_settings_to_db() {
280   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
281   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
282    
283   # vars used by hwdetect   # vars used by hwsetup
284   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
285   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
286   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
287    
288   # get setting from hwdetect   # get setting from hwsetup
289   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
290   source /etc/sysconfig/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
291    
292   echo   echo
293   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   rc_mecho "Importing detected settings to database"
294    
295   # network   # network
296   echo -e "      Network settings ..."   rc_mecho "      Network settings ..."
297   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   if [[ ${ALX_CONFD_NETWORKING} = true ]]
298   "insert into cfg_network(   then
299   hostname,   # get settings
300   serial,   for iface in $(onboot_interface_list ${network_settings}/net.*)
301   module,   do
302   domain,   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
303   networking   rc_echo "WARNING: only importing settings for interface [ ${iface} ] !"
304   )   source ${network_settings}/net.${iface} || echo "Error: could not read '${network_settings}/net.${iface}'"
305   values(   NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
306   '${ALX_DEFAULT_HOSTNAME}',  
307   '${ALX_SERIAL}',   mysqldo "insert into cfg_network(
308   '${NETCARD_DRIVER}',   hostname,
309   '${ALX_DEFAULT_DOMAIN}',   serial,
310   'dhcp'   module,
311   );"   domain,
312     networking,
313     netmask,
314     dns,
315     gateway,
316     broadcast,
317     ip,
318     forcemacto,
319     wireless_bitrate,
320     wireless_channel,
321     wireless_essid,
322     wireless_frequency,
323     wireless_mode,
324     wireless_nick,
325     wireless_auth_mode,
326     wireless_key_length,
327     wireless_key,
328     wireless_key_ascii
329     )
330     values(
331     '${ALX_DEFAULT_HOSTNAME}',
332     '${ALX_SERIAL}',
333     '${NETCARD_DRIVER}',
334     '${ALX_DEFAULT_DOMAIN}',
335     '${NETWORKING}',
336     '${NETMASK}',
337     '${NAMESERVER}',
338     '${GATEWAY}',
339     '${BROADCAST}',
340     '${IP}',
341     '${FORCE_MAC_TO}',
342     '${WIRELESS_BITRATE}',
343     '${WIRELESS_CHANNEL}',
344     '${WIRELESS_ESSID}',
345     '${WIRELESS_FREQUENCY}',
346     '${WIRELESS_MODE}',
347     '${WIRELESS_NICK}',
348     '${WIRELESS_AUTH_MODE}',
349     '${WIRELESS_KEY_LENGTH}',
350     '${WIRELESS_KEY}',
351     '${WIRELESS_KEY_ASCII}'
352     );"
353    
354     # only insert the *FIRST* iface
355     break
356     done
357     else
358     mysqldo "insert into cfg_network(
359     hostname,
360     serial,
361     module,
362     domain,
363     networking
364     )
365     values(
366     '${ALX_DEFAULT_HOSTNAME}',
367     '${ALX_SERIAL}',
368     '${NETCARD_DRIVER}',
369     '${ALX_DEFAULT_DOMAIN}',
370     'dhcp'
371     );"
372     fi
373   evaluate_retval   evaluate_retval
374    
375   # xserver   # xserver
376   echo -e "      Graphic settings ..."   rc_mecho "      Graphic settings ..."
377   # xserver general   # xserver general
378   ( mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ( mysqldo "insert into cfg_graphic(
  "insert into cfg_graphic(  
379   serial,   serial,
380   module,   module,
381   resolution,   resolution,
382   depth,   depth,
383   monitorid   refresh_rate
384   )   )
385   values(   values(
386   '${ALX_SERIAL}',   '${ALX_SERIAL}',
387   '${XMODULE}',   '${XMODULE}',
388   '1024x768',   '1024x768',
389   '16',   '16',
390   '0'   '60'
391   );"; )   );"; )
392   evaluate_retval   evaluate_retval
393    
394   # input   # input
395   echo -e "      Input settings ..."   rc_mecho "      Input settings ..."
396   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"
  "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"  
397   evaluate_retval   evaluate_retval
398    
399   # auth   # auth
400   echo -e "      Authentifcation settings ..."   rc_mecho "      Authentification settings ..."
401   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysqldo "insert into client_auth(
  "insert into client_auth(  
402   serial,   serial,
403   username,   username,
404   shell,   shell,
# Line 355  import_settings_to_db() { Line 418  import_settings_to_db() {
418    
419   # exchange ssh rsa keys - the first boot needs this !   # exchange ssh rsa keys - the first boot needs this !
420   # or no reboot will work via the webadmin   # or no reboot will work via the webadmin
421   echo -e "      SSH authentifcation settings ..."   rc_mecho "      SSH authentification settings ..."
422   HOME=/root config_ssh_auth   HOME=/root config_ssh_auth
423   evaluate_retval   evaluate_retval
424    
425   # input   # autostart
426   echo -e "      Autostart settings ..."   rc_mecho "      Autostart settings ..."
427   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysqldo "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"
428   "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"  
429     # screensaver
430     rc_mecho "      Screensaver settings ..."
431     mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
432    
433     # version info
434     rc_mecho "      OS version info ..."
435     local alx_os
436     local alx_utils
437     alx_os="$(< /etc/mageversion)"
438     alx_utils="$(magequery -n alxconfig-ng | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
439     alx_utils="${alx_utils/alxconfig-ng-}"
440     mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
441    
442   evaluate_retval   evaluate_retval
443  }  }
444    
445  # imports current settings to the database resolved by the hardware detection  # imports current settings to the database resolved by the hardware detection
446  update_settings_in_db() {  update_settings_in_db()
447    {
448   # note: networking is always 'dhcp' if hw was autodetected   # note: networking is always 'dhcp' if hw was autodetected
449   # note: default_domain/hostname is set in config.rc or exported   # note: default_domain/hostname is set in config.rc or exported
450   # note: we updating only hardware settings here !   # note: we updating only hardware settings here !
# Line 376  update_settings_in_db() { Line 453  update_settings_in_db() {
453   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
454   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
455    
456   # vars used by hwdetect   # vars used by hwsetup
457   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
458   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
459   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
460    
461   # get setting from hwdetect   # get setting from hwsetup
462   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
463   source /etc/sysconfig/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
464    
465   echo   echo
466   echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}   rc_mecho "Updating detected settings in database"
467    
468   # network   # network
469   echo -e "      Network settings ..."   rc_mecho "      Network settings ..."
470     if [[ ${ALX_CONFD_NETWORKING} = true ]]
471   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   then
472   "update cfg_network set   # get settings
473   hostname='${ALX_DEFAULT_HOSTNAME}',   #source ${rc_base}/init.d/network &> /dev/null
474   module='${NETCARD_DRIVER}',   for iface in $(onboot_interface_list ${network_settings}/net.*)
475   domain='${ALX_DEFAULT_DOMAIN}',   do
476   networking='dhcp'   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
477   where serial=${ALX_SERIAL};"   rc_echo "WARNING: only importing settings for interface [ ${iface} ] !"
478     source ${network_settings}/net.${iface} || exit 1
479     NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
480    
481     mysqldo "update cfg_network set
482     hostname='${ALX_DEFAULT_HOSTNAME}',
483     module='${NETCARD_DRIVER}',
484     domain='${ALX_DEFAULT_DOMAIN}',
485     networking='${NETWORKING}',
486     netmask='${NETMASK}',
487     dns='${NAMESERVER}',
488     gateway='${GATEWAY}',
489     broadcast='${BROADCAST}',
490     ip='${IP}',
491     forcemacto='${FORCE_MAC_TO}',
492     wireless_bitrate='${WIRELESS_BITRATE}',
493     wireless_channel='${WIRELESS_CHANNEL}',
494     wireless_essid='${WIRELESS_ESSID}',
495     wireless_frequency='${WIRELESS_FREQUENCY}',
496     wireless_mode='${WIRELESS_MODE}',
497     wireless_nick='${WIRELESS_NICK}',
498     wireless_auth_mode='${WIRELESS_AUTH_MODE}',
499     wireless_key_length='${WIRELESS_KEY_LENGTH}',
500     wireless_key='${WIRELESS_KEY}',
501     wireless_key_ascii='${WIRELESS_KEY_ASCII}'
502     where serial=${ALX_SERIAL};"
503    
504     # only insert the *FIRST* iface
505     break
506     done
507     else
508     mysqldo "update cfg_network set
509     hostname='${ALX_DEFAULT_HOSTNAME}',
510     module='${NETCARD_DRIVER}',
511     domain='${ALX_DEFAULT_DOMAIN}',
512     networking='dhcp'
513     where serial=${ALX_SERIAL};"
514     fi
515   evaluate_retval   evaluate_retval
516    
517   # xserver   # xserver
518   echo -e "      Graphic settings ..."   rc_mecho "      Graphic settings ..."
519   # xserver general   # xserver general
520   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysqldo "update cfg_graphic set
  "update cfg_graphic set  
521   module='${XMODULE}',   module='${XMODULE}',
522   resolution='1024x768',   resolution='1024x768',
523   depth='16',   depth='16',
524   monitorid='0'   refresh_rate='60'
525   where serial=${ALX_SERIAL};"   where serial=${ALX_SERIAL};"
526   evaluate_retval   evaluate_retval
527    
528   # input   # input
529   echo -e "      Input settings ..."   rc_mecho "      Input settings ..."
530   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"
  "update cfg_input set  
  mouse='${XMOUSETYPE}'  
  where serial=${ALX_SERIAL};"  
531   evaluate_retval   evaluate_retval
532    
533     # version info
534     rc_mecho "      OS version info ..."
535     local alx_os
536     local alx_utils
537     alx_os="$(< /etc/mageversion)"
538     alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
539     alx_utils="${alx_utils/alxconfig-ng-alx-}"
540     mysqldo "update client_version set os='${alx_os}', utils='${alx_utils}' where serial=${ALX_SERIAL};"
541  }  }
542    
543  # imports current settings to the local system resolved by the hardware detection  # imports current settings to the local system resolved by the hardware detection
544  # we only need the network settings  # we only need the network settings
545  import_settings_local(){  import_settings_local()
546    {
547   # note: networking is always 'dhcp' if hw was autodetected   # note: networking is always 'dhcp' if hw was autodetected
548   # note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
549    
# Line 431  import_settings_local(){ Line 551  import_settings_local(){
551   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
552   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
553    
554   # vars used by hwdetect   # vars used by hwsetup
555   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
556   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
557   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
558    
559   # get setting from hwdetect   # get setting from hwsetup
560   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
561    
562   echo   echo
563   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}   rc_mecho "Importing detected settings to local system"
564    
565   [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}   if [[ ${ALX_CONFD_NETWORKING} = false ]]
566   echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules   then
567   evaluate_retval   # set an device alias for modprobe.conf
568     [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
569     # update only if not the same (to speed up bootprocess - no depmod)
570     CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf"
571     clearconfig
572     addconfig "alias ${ALX_IFACE} ${cfg_network_module}"
573    
574     # update confd-networking default iface
575     [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
576     CONFIG="${SETTINGSPATH}/confd-networking"
577     clearconfig
578     addconfig "${ALX_IFACE}"
579    
580     # regenerate modprobe.conf
581     [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"
582     evaluate_retval
583     fi
584    
585   # set system state to 'already configured'   # set system state to 'already configured'
586   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
587    
588     # install slim desktopmanager configuration
589     config_display_manager
590    
591   # if only an recheck was forced than abort now   # if only an recheck was forced than abort now
592   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0
593    
# Line 459  import_settings_local(){ Line 598  import_settings_local(){
598   # now generate fluxbox config files   # now generate fluxbox config files
599    
600   # fluxbox main config   # fluxbox main config
601   cat ${ALX_SKELETONS}/fluxbox/init \   local fbinit
602   > ${ALX_UNPRIV_HOME}/.fluxbox/init   if [ -f ${ALX_SKELETONS}/fluxbox/init ]
603     then
604     fbinit="${ALX_SKELETONS}/fluxbox/init"
605     else
606     fbinit="/usr/share/fluxbox/init"
607     fi
608     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
609    
610     # fluxbox autostart
611     CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
612     # do not show decorations on messages generated with xmessage
613     if [ -x /usr/bin/xmessage ]
614     then
615     addconfig '[app] (xmessage)'
616     addconfig ' [Deco] {NONE}'
617     addconfig '[end]'
618     fi
619     # add icon utility
620     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
621     # add numlock utility
622     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
623    
624     # fluxbox hotkeys
625     local fbkeys
626     if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
627     then
628     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
629     else
630     fbkeys="/usr/share/fluxbox/keys"
631     fi
632     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
633    
634   # fluxbox menu header   # fluxbox menu header
635   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
  > ${ALX_UNPRIV_HOME}/.fluxbox/menu  
636    
637   # now fix it with proper messages :P   # now fix it with proper messages :P
638   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
639   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
  ${ALX_UNPRIV_HOME}/.fluxbox/menu  
640    
641   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
642   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
643    
644   # fluxbox menu footer   # fluxbox menu footer
645   cat ${ALX_SKELETONS}/fluxbox/menu.footer \   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
  >> ${ALX_UNPRIV_HOME}/.fluxbox/menu  
646    
647   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
648   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
649    
   
650   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
  # basic config  
  cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
   
651   # clean desktop icon location   # clean desktop icon location
652   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.idesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.idesktop
653   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.idesktop
654    
655     # add shutdown, reboot icons
656     local name
657     # default settings
658     declare -i x=30
659     declare -i y=30
660     for i in shutdown reboot
661     do
662     case ${i} in
663     shutdown) name="Herunterfahren" ;;
664     reboot) name="Neustarten" ;;
665     esac
666    
667     generate_icon \
668     --name "${name}" \
669     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
670     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
671     --dest "${dest}/${i}.lnk" \
672     --xres "${x}" \
673     --yres "${y}"
674    
675     y=$((${y} + 80))
676     done
677    
678   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
679   local sysinfo   local sysinfo
# Line 510  import_settings_local(){ Line 695  import_settings_local(){
695   --name "${sysinfo}" \   --name "${sysinfo}" \
696   --command "exit 0" \   --command "exit 0" \
697   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
698   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${ALX_UNPRIV_HOME}/.idesktop/sysinfo.lnk" \
699   --xres "${xres}" \   --xres "${xres}" \
700   --yres "${yres}" \   --yres "${yres}" \
701   --icon-width "1" \   --icon-width "1" \
# Line 520  import_settings_local(){ Line 705  import_settings_local(){
705   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
706   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
707   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
708   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
709   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   if [ -f ${ALX_UNPRIV_HOME}/.ideskrc ]
710     then
711   # default passwords are bad   chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
712   #usermod -p $(perl -e "printf(crypt('foobar','AD'))") root   fi
  #usermod -p $(perl -e "printf(crypt('foobar','AD'))") ${ALX_UNPRIV_USER}  
  #smbpasswd -a root foobar  
713  }  }
714    
715  # start|stop  # start|stop
716  preliminary_network(){  preliminary_network()
717    {
718   local module   local module
719    
720   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
721   then   then
722   # get module name   # compat for old clients
723   module=$(cat ${SETTINGSPATH}/modules)   if [ -f ${SETTINGSPATH}/modules ]
724   modprobe ${module}   then
725     # get module name
726     module=$(cat ${SETTINGSPATH}/modules)
727     modprobe ${module}
728     fi
729    
730   else   else
731   # vars used by hwdetect   # vars used by hwsetup
732   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
733   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
734    
735   # get setting from hwdetect   # get setting from hwsetup
736   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
737   modprobe ${NETCARD_DRIVER}   modprobe ${NETCARD_DRIVER}
738   fi   fi
739    
# Line 553  preliminary_network(){ Line 742  preliminary_network(){
742   # keeping like always safe:   # keeping like always safe:
743   # no network should be startet here,   # no network should be startet here,
744   # so we can delete all pid files if one exists   # so we can delete all pid files if one exists
745   if ps -A|grep dhcpcd > /dev/null   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
746   then   then
747   echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}   rc_mecho "Forcing network down"
748   dhcpcd -k   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
749   sleep 1   sleep 1
  else  
  rm -f /var/run/dhcpcd-eth?.pid  
750   fi   fi
751     [[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
752    
753   echo -e ${COLMAGENTA}"Starting preliminary network ... "${COLDEFAULT}   rc_mecho "Starting preliminary networking ... "
  # -t 10 timeout of 10 secs  
  dhcpcd -t 10 &> /dev/null  
   
  # aka_fix ########################################  
  #ifconfig eth0 128.20.222.222 netmask 255.255.0.0 up  
  #route del default gw 128.20.50.13 &> /dev/null  
  #route add default gw 128.20.50.21 &> /dev/null  
  #echo "nameserver 128.20.50.21" > /etc/resolv.conf  
  ##################################################  
754    
755   evaluate_retval   # start network configured from /etc/conf.d
756     if [[ ${ALX_CONFD_NETWORKING} = true ]]
757     then
758     ${rc_base}/init.d/network start
759     else
760     rc_print "Starting default dhcp based networking ... "
761     ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null
762     evaluate_retval
763     fi
764   ;;   ;;
765    
766   stop)   stop)
767   echo -e ${COLMAGENTA}"Stopping preliminary network ... "${COLDEFAULT}   rc_mecho "Stopping preliminary networking ... "
768   ifconfig eth0 down   if [[ ${ALX_CONFD_NETWORKING} = true ]]
769   if ps -A|grep dhcpcd > /dev/null   then
770     ${rc_base}/init.d/network stop
771     else
772     rc_print "Stopping default dhcp based networking ... "
773     ifconfig ${ALX_IFACE} down
774     fi
775     if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
776   then   then
777   dhcpcd -z  &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
778     sleep 1
779   fi   fi
780   evaluate_retval   evaluate_retval
781   ;;   ;;
# Line 592  preliminary_network(){ Line 786  preliminary_network(){
786   esac   esac
787  }  }
788    
789    reset_system_settings()
790    {
791     # force load of de kbdkeys
792     [ -x /usr/bin/loadkeys ] && loadkeys -q de
793     [ -x /sbin/loadkmap ] && loadkmap < /usr/share/busybox/keymaps/de.kmap
794     rc_echo
795     rc_echo -en "${COLRED}"
796     rc_echo -n '--- Warning: you are about to reset *all* local settings on this system!'
797     rc_echo -e "${COLDEFAULT}"
798     rc_echo '--- Do you really want to continue ?'
799     rc_echo -n '--- Enter 'yes' to continue, anything else to abort: '
800     read kbinsert
801     if [[ ${kbinsert} = yes ]]
802     then
803     rc_echo -en "${COLRED}"
804     rc_echo -n '--- OK, you really want it ... killing all settings: '
805     for i in 3 2 1 now
806     do
807     rc_echo -n " ${i}"
808     sleep 1
809     done
810     rc_echo -e "${COLDEFAULT}"
811    
812     ## reset all settings:
813     rm -rf ${SETTINGSPATH}
814     rm -f /etc/alxconfig-ng/serial
815     rm -rf /etc/alxconfig-ng/state
816     local i
817     for i in xserver netcard knoppix mouse
818     do
819     [[ -f /etc/conf.d/hwsetup/${i} ]] && rm /etc/conf.d/hwsetup/${i}
820     done
821    
822     # clear all printers & net-shares
823     :> /etc/printcap
824    
825     # remove lprng
826     rc-config del lprng &> /dev/null
827     rc-config del nmbd &> /dev/null
828    
829     # remove all user settings
830     [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
831     install -o ${ALX_UNPRIV_USER} -g ${ALX_UNPRIV_GROUP} -d ${ALX_UNPRIV_HOME}
832    
833     # remove all ica-sessions
834     find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm
835    
836     # remove all old nics and modules configs
837     find /etc/conf.d -type f -name 'net.*' | xargs --no-run-if-empty rm
838     find /etc/modprobe.d -type f -name 'net.*' | xargs --no-run-if-empty rm
839    
840     # restore default networking
841     cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
842     local CONFIG="/etc/hostname"
843     clearconfig
844     addconfig "${ALX_DEFAULT_HOSTNAME}"
845    
846     rc_echo -n "I am done now, press [Enter] to reboot system ..."
847     else
848     rc_echo -n "Aborted, press [Enter] to reboot system ..."
849     fi
850     read
851     sync
852     mount -oremount,ro /
853     reboot -f
854    }
855    
856    onboot_interface_list()
857    {
858     local file
859     local devices
860     local iface
861    
862     # get list of all devices
863     for file in $@
864     do
865     if [[ $(read_value ONBOOT ${file}) = yes ]]
866     then
867     iface="$(basename ${file} | sed s/net.//)"
868     # exclude backup files
869     case "${iface}" in
870     *~) ;;
871     *) devices="${devices} $(basename ${file} | sed s/net.//)" ;;
872     esac
873     fi
874     done
875    
876     echo "${devices}"
877    }
878    
879    # read values from net.* files
880    read_value()
881    {
882     local var="$1"
883     local file="$2"
884     local value
885    
886     # local all possible vars
887     # global
888     local ONBOOT
889     local NETWORKING
890    
891     # static
892     local IP
893     local NETMASK
894     local BROADCAST
895     local NETWORKING
896     local FORCE_MAC_TO
897    
898     # dhcp
899     local DHCP_PROG
900     local DHCP_START
901     local DHCP_STOP
902    
903     # default gw
904     local GATEWAY
905     local GATEWAY_IF
906    
907     # wireless extensions
908     local WIRELESS_AP
909     local WIRELESS_AUTH_MODE
910     local WIRELESS_BITRATE
911     local WIRELESS_CHANNEL
912     local WIRELESS_DEFAULT_KEY
913     local WIRELESS_ESSID
914     local WIRELESS_FREQUENCY
915     local WIRELESS_KEY
916     local WIRELESS_KEY_ASCII
917     local WIRELESS_KEY_0
918     local WIRELESS_KEY_1
919     local WIRELESS_KEY_2
920     local WIRELESS_KEY_3
921     local WIRELESS_KEY_LENGTH
922     local WIRELESS_MODE
923     local WIRELESS_NICK
924     local WIRELESS_NWID
925     local WIRELESS_POWER
926    
927     source ${file}
928     eval value=\$$(echo ${var})
929     echo "${value}"
930    }
931    
932  case $1 in  case $1 in
933   start)   start)
934     # check for global overrides
935     [ -f ${SETTINGSPATH}/confd-networking ] && ALX_CONFD_NETWORKING=true
936     [ -f /hardware-auto-detection ] && ALX_FORCED_RECHECK=true
937     read_cmdline hardware-auto-detection && ALX_FORCED_RECHECK=true
938     read_cmdline alx-reset-settings && ALX_RESET_SETTINGS=true
939    
940     # kill all settings if requested
941     if [[ ${ALX_RESET_SETTINGS} = true ]]
942     then
943     reset_system_settings
944     fi
945    
946   # retrieve or validate current serial   # retrieve or validate current serial
947   get_system_serial   get_system_serial
948   if [[ ${ALX_HW_DETECT} = true ]]   if [[ ${ALX_HW_DETECT} = true ]]
# Line 614  case $1 in Line 963  case $1 in
963    
964   # now setup system configuration   # now setup system configuration
965   # alx_setup_or_whatever_it_will_be_called()   # alx_setup_or_whatever_it_will_be_called()
966   [ "${ALX_HW_DETECT}" == "false" ] && update_system_settings   [[ ${ALX_HW_DETECT} = false ]] && update_system_settings
967    
968   # stop at last the preliminary networking (dhcp)   # stop at last the preliminary networking (dhcp)
969   preliminary_network stop   preliminary_network stop
# Line 626  case $1 in Line 975  case $1 in
975   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
976   sleep 0.1   sleep 0.1
977   ;;   ;;
978    
979   *)   *)
980   echo "Usage: $0 {start|stop} ..."   echo "Usage: $0 {start|stop} ..."
981   ;;   ;;
982  esac  esac
   

Legend:
Removed from v.314  
changed lines
  Added in v.3466