Magellan Linux

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

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

revision 282 by niro, Wed Aug 17 21:19:52 2005 UTC revision 307 by niro, Sun Aug 28 19:30:53 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.15 2005-08-17 21:19:52 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.18 2005-08-28 19:30:53 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 88  get_system_serial(){ Line 88  get_system_serial(){
88   then   then
89   source /etc/alxconfig-ng/serial   source /etc/alxconfig-ng/serial
90    
  # doing this now before this function gets called  
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)
# Line 107  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
# Line 115  get_system_serial(){ Line 126  get_system_serial(){
126   echo   echo
127   if [ -f /hardware-auto-detection ]   if [ -f /hardware-auto-detection ]
128   then   then
129   echo -e ${COLMAGENTA}"Hardware-Auto-Detection forced by system-administrator"${COLDEFAULT}   echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
130   else   else
131   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
132   fi   fi
# Line 134  get_system_serial(){ Line 145  get_system_serial(){
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)
# Line 155  get_system_serial(){ Line 174  get_system_serial(){
174   then   then
175   ALX_STATE="ok"   ALX_STATE="ok"
176   else   else
177     # abort on non valid serial
178   ALX_STATE="invalid serial"   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   fi
183    
184   # write current state to temp file   # write current state to temp file
# Line 435  import_settings_local(){ Line 458  import_settings_local(){
458   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header \
459   > ${ALX_UNPRIV_HOME}/.fluxbox/menu   > ${ALX_UNPRIV_HOME}/.fluxbox/menu
460    
461     # now fix it with proper messages :P
462     local ver="$(< /etc/mageversion)"
463     sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \
464     ${ALX_UNPRIV_HOME}/.fluxbox/menu
465    
466   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
467   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
468    
# Line 449  import_settings_local(){ Line 477  import_settings_local(){
477   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
478   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
479   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
  chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop  
  chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc  
480    
481   # default passwords are bad   # default passwords are bad
482   #usermod -p $(perl -e "printf(crypt('foobar','AD'))") root   #usermod -p $(perl -e "printf(crypt('foobar','AD'))") root
# Line 523  preliminary_network(){ Line 549  preliminary_network(){
549    
550  case $1 in  case $1 in
551   start)   start)
  # start preliminary networking (dhcp)  
  preliminary_network start  
   
  # check if mysql server is reachable  
  # if not abort this script  
  if ! reach_mysql_server  
  then  
  preliminary_network stop  
  exit 1  
  fi  
   
552   # retrieve or validate current serial   # retrieve or validate current serial
553   get_system_serial   get_system_serial
554   if [[ ${ALX_HW_DETECT} = true ]]   if [[ ${ALX_HW_DETECT} = true ]]

Legend:
Removed from v.282  
changed lines
  Added in v.307