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

Legend:
Removed from v.297  
changed lines
  Added in v.3460