Magellan Linux

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

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

revision 239 by niro, Tue Apr 12 20:46:52 2005 UTC revision 319 by niro, Thu Sep 1 18:30:28 2005 UTC
# Line 11  Line 11 
11  #%before:  #%before:
12  #%after:  #%after:
13    
14  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.7 2005-04-12 20:45:55 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.21 2005-09-01 18:30:28 niro Exp $
15    
16  # checks first if the client was already configured and if it has an valid serial  # checks first if the client was already configured and if it has an valid serial
17  # if not it runs the autoconfiguration script  # if not it runs the autoconfiguration script
# Line 24  Line 24 
24  source /etc/sysconfig/rc  source /etc/sysconfig/rc
25  source $rc_functions  source $rc_functions
26    
27  #mysql settings  # mysql settings
28  source /etc/alxconfig-ng/config.rc  source /etc/alxconfig-ng/config.rc
29    
30    # helper functions
31  source /usr/lib/alxconfig-ng/functions/mysqlfunctions  source /usr/lib/alxconfig-ng/functions/mysqlfunctions
32  source /usr/lib/alxconfig-ng/functions/serial_functions  source /usr/lib/alxconfig-ng/functions/serial_functions
33    source /usr/lib/alxconfig-ng/functions/config_modules
34  source /usr/lib/alxconfig-ng/functions/config_network  source /usr/lib/alxconfig-ng/functions/config_network
35  source /usr/lib/alxconfig-ng/functions/config_printers  source /usr/lib/alxconfig-ng/functions/config_printers
36  source /usr/lib/alxconfig-ng/functions/config_sessions  source /usr/lib/alxconfig-ng/functions/config_sessions
37  source /usr/lib/alxconfig-ng/functions/config_x11  source /usr/lib/alxconfig-ng/functions/config_x11
38    source /usr/lib/alxconfig-ng/functions/config_auth
39    source /usr/lib/alxconfig-ng/functions/config_ssh_auth
40    
41  #check if mysql is available  # check if mysql is available
42  [ -x /usr/bin/mysql ] && MYSQL_ALX=true  [ -x /usr/bin/mysql ] && MYSQL_ALX=true
43    
44  #other needed vars  # other needed vars
45  ALX_HW_DETECT=false  ALX_HW_DETECT=false
46    ALX_FORCED_RECHECK=false
47    
48  #unset vars which may kill us  # unset vars which may kill us
49  unset ALX_SERIAL ALX_STATE  unset ALX_SERIAL ALX_STATE
50    
51    
52  #setup needed directories  # setup needed directories
53  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state
54    
55    
 validate_sessions(){  
   
  local x i all LOCAL_SESSIONS DB_SESSIONS SETTINGSPATH count  
   
  #all arrays:  
  # ->  session1 session2 ... sessionN  
   
   
  #no LOCAL_SESSIONS here, needs bubblesort  
   
  #get settings from database  
  all=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  "select session from cfg_sessions where serial='${ALX_SERIAL}'")  
   
  #split'em up and put in an array (only if $all not zero)  
  declare -i i=0  
  if [ -n "${all}" ]  
  then  
  for x in ${all}  
  do  
  DB_SESSIONS[${i}]=${x}  
  ((i++))  
  done  
  count=${i}  
  else  
  count=0  
  fi  
   
  ## no compare here, can only done with bubblesort or s.th like that  
  # shows only the new sessions  
  declare -i i=0  
  #count=${#DB_SESSIONS[*]} #---> not working gets always 1, why ?  
   
  echo "Number of new sessions: ${count}"  
  for ((i=0; i < count; i++))  
  do  
  echo "${i} - ${DB_SESSIONS[${i}]}"  
  done  
   
  #update local configs  
  SETTINGSPATH=${SETTINGS_TEMPLATE}/menu  
  declare -i i=0  
   
  #count=${#DB_SESSIONS[*]}  
   
  if [ ${count} -gt 0 ]  
  then  
  #create directory if not exist  
  [ ! -d ${SETTINGSPATH}/sessions ] && install -d ${SETTINGSPATH}/sessions  
   
  #delete old sessions  
  echo -n > ${SETTINGSPATH}/sessions/sessions  
   
  for ((i=0; i < count; i++))  
  do  
  echo "${DB_SESSIONS[${i}]}" >> ${SETTINGSPATH}/sessions/sessions  
  done  
   
  #set update flag  
  ALX_SESSION_SETUP=true  
  fi  
 }  
   
   
56  update_system_settings(){  update_system_settings(){
57   echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}   echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}
58    
59     # get the modules settings
60     # ! is the first thing that must be configured !
61     config_modules
62    
63   # imports network settings from db   # imports network settings from db
64   config_networking   config_networking
65    
66   # imports x11 settings from db   # imports x11 settings from db
67   config_x11   config_x11
68    
69   #echo   # imports session settings from db
  #echo "sessions"  
  #validate_sessions  
  #echo  
70   config_sessions   config_sessions
71    
72   # imports printer settings from db   # imports printer settings from db
73   config_printing   config_printing
74    
75     # imports auth settings from db
76     config_auth
77    
78     # exchange ssh rsa keys
79     HOME=/root config_ssh_auth
80  }  }
81    
82  get_system_serial(){  get_system_serial(){
83    
84   local CUR_IP CUR_MAC CUR_MTIME   local CUR_IP CUR_MAC CUR_MTIME
85    
86   #check if serial file exists   # check if serial file exists
87   if [ -f /etc/alxconfig-ng/serial ]   if [ -f /etc/alxconfig-ng/serial ] && [ ! -f /hardware-auto-detection ]
88   then   then
89   source /etc/alxconfig-ng/serial   source /etc/alxconfig-ng/serial
90    
91   #start preliminary networking (dhcp)   # start preliminary networking (dhcp)
92   preliminary_network start   preliminary_network start
93    
94     # check if mysql server is reachable
95     # if not abort this script
96     if ! reach_mysql_server
97     then
98     preliminary_network stop
99     exit 1
100     fi
101    
102   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
103   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
104   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
105    
106   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
107    
108   #nice serial output   # nice serial output
109   $CURS_UP   $CURS_UP
110   $SET_WCOL   $SET_WCOL
111   echo "[ SN: ${ALX_SERIAL} ]"   echo "[ SN: ${ALX_SERIAL} ]"
# Line 157  get_system_serial(){ Line 114  get_system_serial(){
114   then   then
115   ALX_STATE="ok"   ALX_STATE="ok"
116   else   else
117     # abort on non valid serial
118   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
119     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
120     show_invalid_serial_msg
121     exit 1
122   fi   fi
123    
124   else   else
125   #run hardware detection   # run hardware detection
126   echo   echo
127   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   if [ -f /hardware-auto-detection ]
128     then
129     echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
130     else
131     echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
132     fi
133   ALX_HW_DETECT=true   ALX_HW_DETECT=true
134   /etc/init.d/hwdetect start   /etc/init.d/hwdetect start
135    
136   #set hostname to alx_default_hostname   # set hostname to alx_default_hostname
137     # use old hostname if this is a forced re-check
138     [ -f /hardware-auto-detection ] && ALX_DEFAULT_HOSTNAME="$(< /etc/hostname)"
139   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
140   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
141    
142   #update the hostname on the system for sure   # update the hostname on the system for sure
143   echo "${HOSTNAME}" > /etc/hostname   echo "${HOSTNAME}" > /etc/hostname
144    
145   #start preliminary networking (dhcp)   # start preliminary networking (dhcp)
146   preliminary_network start   preliminary_network start
147    
148     # check if mysql server is reachable
149     # if not abort this script
150     if ! reach_mysql_server
151     then
152     preliminary_network stop
153     exit 1
154     fi
155    
156   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
157   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
158   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
159    
160     # abort now if this is a forced re-check
161     if [ -f /hardware-auto-detection ]
162     then
163     # but first check the serial
164     source /etc/alxconfig-ng/serial
165    
166     echo -e ${COLOREDSTAR} "Trying to validate my serial ..."
167    
168     # nice serial output
169     $CURS_UP
170     $SET_WCOL
171     echo "[ SN: ${ALX_SERIAL} ]"
172    
173     if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
174     then
175     ALX_STATE="ok"
176     else
177     # abort on non valid serial
178     ALX_STATE="invalid serial"
179     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
180     show_invalid_serial_msg
181     exit 1
182     fi
183    
184     # write current state to temp file
185     echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
186     rm /hardware-auto-detection
187    
188     # now export ALX_FORCED_RECHECK=true
189     # that the setting will be updated not inserted !
190     export ALX_FORCED_RECHECK=true
191     return 0
192     fi
193    
194   echo -e ${COLOREDSTAR} "Trying to get new serial ..."   echo -e ${COLOREDSTAR} "Trying to get new serial ..."
195    
196   #request new serial   # request new serial
197   #ALX_REG_DATE="$(date +%F)"   # ALX_REG_DATE="$(date +%F)"
198    
199   #we're using the mtime now (better for vaildating the serial)   # we're using the mtime now (better for validating the serial)
200   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  # mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
201   "insert into client_serials(  # "insert into client_serials(
202   mtime,  # mtime,
203   mac  # mac
204   )  # )
205   values(  # values(
206   '${CUR_MTIME}',  # '${CUR_MTIME}',
207   '${CUR_MAC}'  # '${CUR_MAC}'
208   );"  # );"
209    #
210   #then validate and retrieve serial  # # then validate and retrieve serial
211    #
212   ### warning must be changed that only the LAST ID will be fetched,  ###  # ### warning must be changed that only the LAST ID will be fetched,  ###
213   ### or you get error if the computer name and date are the same     ###  # ### or you get error if the computer name and date are the same     ###
214   ### you have more than one serial number then                       ###  # ### you have more than one serial number then                       ###
215    #
216    # # select highest id only (added max)
217    # ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
218    # "select max(serial) from client_serials where mtime='${CUR_MTIME}' and mac='${CUR_MAC}'")
219    
220   #select highest id only (added max)   # request a new serial; one command now (cause must be done in the same session)
221   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ALX_SERIAL=$(mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
222   "select max(serial) from client_serials where mtime='${CUR_MTIME}' and mac='${CUR_MAC}'")   "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');
223     select last_insert_id();")
224    
225   if [ "${ALX_SERIAL}" != NULL ]   if [ "${ALX_SERIAL}" != NULL ]
226   then   then
227   #nice serial output   # nice serial output
228   $CURS_UP   $CURS_UP
229   $SET_WCOL   $SET_WCOL
230   echo "[ SN: ${ALX_SERIAL} ]"   echo "[ SN: ${ALX_SERIAL} ]"
231    
232   #set ALX_STATE to ok so everybody that everything was ok   # set ALX_STATE to ok so everybody that everything was ok
233   ALX_STATE=ok   ALX_STATE=ok
234    
235   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial   echo "ALX_SERIAL=${ALX_SERIAL}" > /etc/alxconfig-ng/serial
# Line 222  get_system_serial(){ Line 237  get_system_serial(){
237    
238   evaluate_retval   evaluate_retval
239   else   else
240   #print false (works only if this is the first statement here)   # print false (works only if this is the first statement here)
241   evaluate_retval   evaluate_retval
242    
243   #set ALX_STATE to error so everybody sees there was an error   # set ALX_STATE to error so everybody sees there was an error
244   ALX_STATE=error   ALX_STATE=error
245    
246   #show an error that no new serial was found   # show an error that no new serial was found
247   #nice serial output   # nice serial output
248   $CURS_UP   $CURS_UP
249   $SET_WCOL   $SET_WCOL
250   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"
251   fi   fi
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   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state
256  }  }
257    
# Line 253  check_is_configured() { Line 268  check_is_configured() {
268    
269  # imports current settings to the database resolved by the hardware detection  # imports current settings to the database resolved by the hardware detection
270  import_settings_to_db() {  import_settings_to_db() {
271   #note: networking is always 'dhcp' if hw was autodetected   # note: networking is always 'dhcp' if hw was autodetected
272   #note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
273    
274   #to be safe, we do some sanity checks   # to be safe, we do some sanity checks
275   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
276   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
277    
278   #vars used by hwdetect   # vars used by hwdetect
279   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
280   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
281   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
282    
283   #get setting from hwdetect   # get setting from hwdetect
284   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
285   source /etc/sysconfig/hwsetup/mouse   source /etc/sysconfig/hwsetup/mouse
286    
287   echo   echo
288   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
289    
290   #network   # network
291   echo -e "      Network settings ..."   echo -e "      Network settings ..."
292   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
293   "insert into cfg_network(   "insert into cfg_network(
# Line 291  import_settings_to_db() { Line 306  import_settings_to_db() {
306   );"   );"
307   evaluate_retval   evaluate_retval
308    
309   #xserver   # xserver
310   echo -e "      Graphic settings ..."   echo -e "      Graphic settings ..."
311   #xserver general   # xserver general
312   ( mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   ( mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
313   "insert into cfg_graphic(   "insert into cfg_graphic(
314   serial,   serial,
# Line 308  import_settings_to_db() { Line 323  import_settings_to_db() {
323   '1024x768',   '1024x768',
324   '16',   '16',
325   '0'   '0'
326   );";   );"; )
327     evaluate_retval
328    
329   # input   # input
330    mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   echo -e "      Input settings ..."
331   "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');";)   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
332     "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"
333     evaluate_retval
334    
335     # auth
336     echo -e "      Authentifcation settings ..."
337     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
338     "insert into client_auth(
339     serial,
340     username,
341     shell,
342     vnc,
343     samba,
344     station
345     )
346     values(
347     '${ALX_SERIAL}',
348     '${ALX_UNPRIV_USER}',
349     '',
350     '',
351     '',
352     ''
353     );"
354     evaluate_retval
355    
356     # exchange ssh rsa keys - the first boot needs this !
357     # or no reboot will work via the webadmin
358     echo -e "      SSH authentifcation settings ..."
359     HOME=/root config_ssh_auth
360     evaluate_retval
361    
362     # input
363     echo -e "      Autostart settings ..."
364     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
365     "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"
366     evaluate_retval
367    }
368    
369    # imports current settings to the database resolved by the hardware detection
370    update_settings_in_db() {
371     # note: networking is always 'dhcp' if hw was autodetected
372     # note: default_domain/hostname is set in config.rc or exported
373     # note: we updating only hardware settings here !
374    
375     # to be safe, we do some sanity checks
376     [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
377     [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
378    
379     # vars used by hwdetect
380     local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
381     local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
382     local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
383    
384     # get setting from hwdetect
385     source /etc/sysconfig/hwsetup/knoppix
386     source /etc/sysconfig/hwsetup/mouse
387    
388     echo
389     echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}
390    
391     # network
392     echo -e "      Network settings ..."
393    
394     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
395     "update cfg_network set
396     hostname='${ALX_DEFAULT_HOSTNAME}',
397     module='${NETCARD_DRIVER}',
398     domain='${ALX_DEFAULT_DOMAIN}',
399     networking='dhcp'
400     where serial=${ALX_SERIAL};"
401     evaluate_retval
402    
403     # xserver
404     echo -e "      Graphic settings ..."
405     # xserver general
406     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
407     "update cfg_graphic set
408     module='${XMODULE}',
409     resolution='1024x768',
410     depth='16',
411     monitorid='0'
412     where serial=${ALX_SERIAL};"
413     evaluate_retval
414    
415     # input
416     echo -e "      Input settings ..."
417     mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
418     "update cfg_input set
419     mouse='${XMOUSETYPE}'
420     where serial=${ALX_SERIAL};"
421   evaluate_retval   evaluate_retval
422  }  }
423    
424  # imports current settings to the local system resolved by the hardware detection  # imports current settings to the local system resolved by the hardware detection
425  # we only need the network settings  # we only need the network settings
426  import_settings_local(){  import_settings_local(){
427   #note: networking is always 'dhcp' if hw was autodetected   # note: networking is always 'dhcp' if hw was autodetected
428   #note: default_domain/hostname is set in config.rc   # note: default_domain/hostname is set in config.rc
429    
430   #to be safe, we do some sanity checks   # to be safe, we do some sanity checks
431   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
432   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
433    
434   #vars used by hwdetect   # vars used by hwdetect
435   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
436   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
437   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
438    
439   #get setting from hwdetect   # get setting from hwdetect
440   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
441    
442   echo   echo
# Line 341  import_settings_local(){ Line 446  import_settings_local(){
446   echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules   echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
447   evaluate_retval   evaluate_retval
448    
449   #set system state to 'already configured'   # set system state to 'already configured'
450   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
451    
452     # if only an recheck was forced than abort now
453     [[ ${ALX_FORCED_RECHECK} = true ]] && return 0
454    
455     # create a fresh fluxbox directory
456     [ -d ${ALX_UNPRIV_HOME}/.fluxbox ] && rm -rf ${ALX_UNPRIV_HOME}/.fluxbox
457     install -d ${ALX_UNPRIV_HOME}/.fluxbox
458    
459     # now generate fluxbox config files
460    
461     # fluxbox main config
462     cat ${ALX_SKELETONS}/fluxbox/init \
463     > ${ALX_UNPRIV_HOME}/.fluxbox/init
464    
465     # fluxbox autostart
466     cat ${ALX_SKELETONS}/fluxbox/apps \
467     > ${ALX_UNPRIV_HOME}/.fluxbox/apps
468    
469     # fluxbox menu header
470     cat ${ALX_SKELETONS}/fluxbox/menu.header \
471     > ${ALX_UNPRIV_HOME}/.fluxbox/menu
472    
473     # now fix it with proper messages :P
474     local ver="$(< /etc/mageversion)"
475     sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \
476     ${ALX_UNPRIV_HOME}/.fluxbox/menu
477    
478     # add a newline (maybe there is no crlf in the header)
479     echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
480    
481     # fluxbox menu footer
482     cat ${ALX_SKELETONS}/fluxbox/menu.footer \
483     >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
484    
485     # add a newline (maybe there is no crlf in the footer)
486     echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
487    
488    
489     # setup some standart icons (sysinfo.lnk)
490     # basic config
491     cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc
492    
493     # clean desktop icon location
494     [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop
495     install -d ${ALX_UNPRIV_HOME}/.xtdesktop
496    
497     # last but not least gen a icon with some sys informations
498     local sysinfo
499     local osversion
500     local xres
501     local yres
502    
503     osversion="$(< /etc/mageversion)"
504     sysinfo="Hostname: ${ALX_DEFAULT_HOSTNAME} Serial: #${ALX_SERIAL} OS: alx-${osversion} Kernel: $(uname -r)"
505    
506     # at first boot we got always a resolution of 1024x768-16@60
507     # middle of the screen
508     # (no txt - length required, xtdesk manage that itself)
509     xres="$((1024 / 2))"
510     # default y pos (full yres -22 !)
511     yres="$((768 - 22 ))"
512    
513     generate_icon \
514     --name "${sysinfo}" \
515     --command "exit 0" \
516     --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
517     --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \
518     --xres "${xres}" \
519     --yres "${yres}" \
520     --icon-width "1" \
521     --icon-height "1"
522    
523     # set correct permissions
524     chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
525     chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
526     chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
527     chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop
528     chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc
529    
530     # default passwords are bad
531     #usermod -p $(perl -e "printf(crypt('foobar','AD'))") root
532     #usermod -p $(perl -e "printf(crypt('foobar','AD'))") ${ALX_UNPRIV_USER}
533     #smbpasswd -a root foobar
534  }  }
535    
536  #start|stop  # start|stop
537  preliminary_network(){  preliminary_network(){
538   local module   local module
539    
540   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
541   then   then
542   #get module name   # get module name
543   module=$(cat ${SETTINGSPATH}/modules)   module=$(cat ${SETTINGSPATH}/modules)
544   modprobe ${module}   modprobe ${module}
545   else   else
546   #vars used by hwdetect   # vars used by hwdetect
547   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
548   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
549    
550   #get setting from hwdetect   # get setting from hwdetect
551   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
552   modprobe ${NETCARD_DRIVER}   modprobe ${NETCARD_DRIVER}
553   fi   fi
# Line 379  preliminary_network(){ Line 567  preliminary_network(){
567   fi   fi
568    
569   echo -e ${COLMAGENTA}"Starting preliminary network ... "${COLDEFAULT}   echo -e ${COLMAGENTA}"Starting preliminary network ... "${COLDEFAULT}
570   dhcpcd &> /dev/null   # -t 10 timeout of 10 secs
571     dhcpcd -t 10 &> /dev/null
572    
573   # aka_fix ########################################   # aka_fix ########################################
574   #ifconfig eth0 128.20.222.222 netmask 255.255.0.0 up   #ifconfig eth0 128.20.222.222 netmask 255.255.0.0 up
# Line 409  preliminary_network(){ Line 598  preliminary_network(){
598    
599  case $1 in  case $1 in
600   start)   start)
601   #retrieve or validate current serial   # retrieve or validate current serial
602   get_system_serial   get_system_serial
603   if [ "${ALX_HW_DETECT}" == "true" ]   if [[ ${ALX_HW_DETECT} = true ]]
604   then   then
605   import_settings_to_db   if [[ ${ALX_FORCED_RECHECK} = true ]]
606     then
607     update_settings_in_db
608     else
609     import_settings_to_db
610     fi
611   import_settings_local   import_settings_local
612    
613     # here we should also exchange the ssh keys
614     # or the system cannot be rebooted after
615     # the first start via the alx-webadmin
616     config_ssh_auth
617   fi   fi
618    
619   #now setup system configuration   # now setup system configuration
620   #alx_setup_or_whatever_it_will_be_called()   # alx_setup_or_whatever_it_will_be_called()
621   [ "${ALX_HW_DETECT}" == "false" ] && update_system_settings   [ "${ALX_HW_DETECT}" == "false" ] && update_system_settings
622    
623   #stop at last the preliminary networking (dhcp)   # stop at last the preliminary networking (dhcp)
624   preliminary_network stop   preliminary_network stop
625   ;;   ;;
626    
627   stop)   stop)
628   #unset_alx_connected #--> now in alxsetstate-rc6   # unset_alx_connected #--> now in alxsetstate-rc6
629   # ! important !: del systemstate   # ! important !: del systemstate
630   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
631   sleep 0.1   sleep 0.1
# Line 435  case $1 in Line 634  case $1 in
634   echo "Usage: $0 {start|stop} ..."   echo "Usage: $0 {start|stop} ..."
635   ;;   ;;
636  esac  esac
637    

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