Magellan Linux

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

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

revision 227 by niro, Wed Mar 9 00:04:23 2005 UTC revision 231 by niro, Wed Mar 9 00:25:57 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.3 2005-03-09 00:04:23 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.6 2005-03-09 00:25:57 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 137  get_system_serial(){ Line 137  get_system_serial(){
137   then   then
138   source /etc/alxconfig-ng/serial   source /etc/alxconfig-ng/serial
139    
  # if system is already configured, it *has* a hostname.  
  # so we take the hostname of this system here  
  source /etc/hostname  
   
140   #start preliminary networking (dhcp)   #start preliminary networking (dhcp)
141   preliminary_network start   preliminary_network start
142    
# Line 174  get_system_serial(){ Line 170  get_system_serial(){
170   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
171    
172   #update the hostname on the system for sure   #update the hostname on the system for sure
173   echo "HOSTNAME=${HOSTNAME}" > /etc/hostname   echo "${HOSTNAME}" > /etc/hostname
174    
175   #start preliminary networking (dhcp)   #start preliminary networking (dhcp)
176   preliminary_network start   preliminary_network start
# Line 257  check_is_configured() { Line 253  check_is_configured() {
253  import_settings_to_db() {  import_settings_to_db() {
254   #note: networking is always 'dhcp' if hw was autodetected   #note: networking is always 'dhcp' if hw was autodetected
255   #note: default_domain/hostname is set in config.rc   #note: default_domain/hostname is set in config.rc
256    
257   #to be safe, we do some sanity checks   #to be safe, we do some sanity checks
258   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
259   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
260    
261   #vars used by hwdetect   #vars used by hwdetect
262   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
263   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
264   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
265    
266   #get setting from hwdetect   #get setting from hwdetect
267   source /etc/sysconfig/hwsetup/knoppix   source /etc/sysconfig/hwsetup/knoppix
268   source /etc/sysconfig/hwsetup/mouse   source /etc/sysconfig/hwsetup/mouse
269    
270   echo   echo
271   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
272    
273   #network   #network
274   echo -e "      Network settings ..."   echo -e "      Network settings ..."
275   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \
# Line 292  import_settings_to_db() { Line 288  import_settings_to_db() {
288   'dhcp'   'dhcp'
289   );"   );"
290   evaluate_retval   evaluate_retval
291    
292   #xserver   #xserver
293   echo -e "      Graphic settings ..."   echo -e "      Graphic settings ..."
294   #xserver general   #xserver general
# Line 301  import_settings_to_db() { Line 297  import_settings_to_db() {
297   serial,   serial,
298   module,   module,
299   resolution,   resolution,
300   depth   depth,
301     monitorid
302   )   )
303   values(   values(
304   '${ALX_SERIAL}',   '${ALX_SERIAL}',
305   '${XMODULE}',   '${XMODULE}',
306   '1024x768',   '1024x768',
307   '16'   '16',
308   );";   '0'
  #xserver monitor  
   mysql_command ${SQL_USER} ${SQL_PASS} ${SQL_HOST} ${SQL_DB} \  
  "insert into cfg_monitor(  
  serial,  
  vendor,  
  model,  
  hsync,  
  vrefresh  
  )  
  values(  
  '${ALX_SERIAL}',  
  'Aamazing',  
  'CM-1528-FS',  
  '28-64',  
  '47-104'  
309   );";   );";
310    
311   # input   # input
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_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');";)   "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');";)

Legend:
Removed from v.227  
changed lines
  Added in v.231