Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/branches/alxconf-060/init.d/alxsettings

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

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

    revision 3457 by niro, Fri Apr 13 17:10:56 2012 UTC revision 3467 by niro, Fri Apr 13 17:29:18 2012 UTC
    # Line 87  update_system_settings() Line 87  update_system_settings()
    87    
    88  get_system_serial()  get_system_serial()
    89  {  {
    90   local CUR_IP CUR_MAC CUR_MTIME ALX_IFACE   # never declare ALX_IFACE as a local variable! ->fixme!
    91     local CUR_IP CUR_MAC CUR_MTIME CONFIG
    92    
    93   if [[ ${ALX_CONFD_NETWORKING} = true ]]   if [[ ${ALX_CONFD_NETWORKING} = true ]]
    94   then   then
    # Line 129  get_system_serial() Line 130  get_system_serial()
    130   else   else
    131   # abort on non valid serial   # abort on non valid serial
    132   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
    133   echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
    134     clearconfig
    135     addconfig "ALX_STATE=\"${ALX_STATE}\""
    136   show_invalid_serial_msg   show_invalid_serial_msg
    137   exit 1   exit 1
    138   fi   fi
    # Line 155  get_system_serial() Line 158  get_system_serial()
    158   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"   HOSTNAME="${ALX_DEFAULT_HOSTNAME}"
    159    
    160   # update the hostname on the system for sure   # update the hostname on the system for sure
    161   echo "${HOSTNAME}" > /etc/hostname   CONFIG="/etc/hostname"
    162     clearconfig
    163     addconfig "${HOSTNAME}"
    164    
    165   # start preliminary networking (dhcp)   # start preliminary networking (dhcp)
    166   preliminary_network start   preliminary_network start
    # Line 168  get_system_serial() Line 173  get_system_serial()
    173   exit 1   exit 1
    174   fi   fi
    175    
       
    176   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
    177   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
    178   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    # Line 192  get_system_serial() Line 196  get_system_serial()
    196   else   else
    197   # abort on non valid serial   # abort on non valid serial
    198   ALX_STATE="invalid serial"   ALX_STATE="invalid serial"
    199   echo "ALX_STATE=${ALX_STATE}" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
    200     clearconfig
    201     addconfig "ALX_STATE=\"${ALX_STATE}\""
    202   show_invalid_serial_msg   show_invalid_serial_msg
    203   exit 1   exit 1
    204   fi   fi
    205    
    206   # write current state to temp file   # write current state to temp file
    207   echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
    208     clearconfig
    209     addconfig "ALX_STATE=\"${ALX_STATE}\""
    210   [ -f /hardware-auto-detection ] && rm /hardware-auto-detection   [ -f /hardware-auto-detection ] && rm /hardware-auto-detection
    211    
    212   # now export ALX_FORCED_RECHECK=true   # now export ALX_FORCED_RECHECK=true
    # Line 223  get_system_serial() Line 231  get_system_serial()
    231   # set ALX_STATE to ok so everybody knows that everything was ok   # set ALX_STATE to ok so everybody knows that everything was ok
    232   ALX_STATE=ok   ALX_STATE=ok
    233    
    234   echo "ALX_SERIAL=\"${ALX_SERIAL}\"" > /etc/alxconfig-ng/serial   CONFIG="/etc/alxconfig-ng/serial"
    235   echo "ALX_REG_DATE=\"${CUR_MTIME}\"" >> /etc/alxconfig-ng/serial   clearconfig
    236     addconfig "ALX_SERIAL=\"${ALX_SERIAL}\""
    237     addconfig "ALX_REG_DATE=\"${CUR_MTIME}\""
    238    
    239   evaluate_retval   evaluate_retval
    240   else   else
    # Line 243  get_system_serial() Line 253  get_system_serial()
    253   fi   fi
    254    
    255   # write current state to temp file   # write current state to temp file
    256   echo "ALX_STATE=\"${ALX_STATE}\"" > /etc/alxconfig-ng/state/state   CONFIG="/etc/alxconfig-ng/state/state"
    257   echo "ALX_IFACE=\"${ALX_IFACE}\"" >> /etc/alxconfig-ng/state/state   clearconfig
    258     addconfig "ALX_STATE=\"${ALX_STATE}\""
    259     addconfig "ALX_IFACE=\"${ALX_IFACE}\""
    260  }  }
    261    
    262    
    # Line 781  reset_system_settings() Line 793  reset_system_settings()
    793   [ -x /usr/bin/loadkeys ] && loadkeys -q de   [ -x /usr/bin/loadkeys ] && loadkeys -q de
    794   [ -x /sbin/loadkmap ] && loadkmap < /usr/share/busybox/keymaps/de.kmap   [ -x /sbin/loadkmap ] && loadkmap < /usr/share/busybox/keymaps/de.kmap
    795   rc_echo   rc_echo
    796   rc_echo -en ${COLRED}   rc_echo -en "${COLRED}"
    797   rc_echo -n "*** Warning: you are about to reset *all* local settings on this system!"   rc_echo -n '--- Warning: you are about to reset *all* local settings on this system!'
    798   rc_echo -e ${COLDEFAULT}   rc_echo -e "${COLDEFAULT}"
    799   rc_echo "*** Do you really want to continue ?"   rc_echo '--- Do you really want to continue ?'
    800   rc_echo -n "*** Enter 'yes' to continue, anything else to abort: "   rc_echo -n '--- Enter 'yes' to continue, anything else to abort: '
    801   read kbinsert   read kbinsert
    802   if [[ ${kbinsert} = yes ]]   if [[ ${kbinsert} = yes ]]
    803   then   then
    804   rc_echo -en ${COLRED}   rc_echo -en "${COLRED}"
    805   rc_echo -n "*** OK, you really want it ... killing all settings: "   rc_echo -n '--- OK, you really want it ... killing all settings: '
    806   for i in 3 2 1 now   for i in 3 2 1 now
    807   do   do
    808   rc_echo -n " ${i}"   rc_echo -n " ${i}"
    809   sleep 1   sleep 1
    810   done   done
    811   rc_echo -e ${COLDEFAULT}   rc_echo -e "${COLDEFAULT}"
    812    
    813   ## reset all settings:   ## reset all settings:
    814   rm -rf ${SETTINGSPATH}/*   rm -rf ${SETTINGSPATH}
    815   rm -f /etc/alxconfig-ng/serial   rm -f /etc/alxconfig-ng/serial
    816   rm -rf /etc/alxconfig-ng/state   rm -rf /etc/alxconfig-ng/state
    817     local i
    818     for i in xserver netcard knoppix mouse
    819     do
    820     [[ -f /etc/conf.d/hwsetup/${i} ]] && rm /etc/conf.d/hwsetup/${i}
    821     done
    822    
    823   # clear all printers & net-shares   # clear all printers & net-shares
    824   :> /etc/printcap   :> /etc/printcap
    825    
    826   # remove lprng   # remove lprng
    827   rc-config del lprng &> /dev/null   rc-config del lprng &> /dev/null
    828     rc-config del nmbd &> /dev/null
    829    
    830   # remove all user settings   # remove all user settings
    831   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
    832     install -o ${ALX_UNPRIV_USER} -g ${ALX_UNPRIV_GROUP} -d ${ALX_UNPRIV_HOME}
    833    
    834   # remove all ica-sessions   # remove all ica-sessions
    835   find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm   find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm
    # Line 821  reset_system_settings() Line 840  reset_system_settings()
    840    
    841   # restore default networking   # restore default networking
    842   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
    843     local CONFIG="/etc/hostname"
    844     clearconfig
    845     addconfig "${ALX_DEFAULT_HOSTNAME}"
    846    
    847   rc_echo "I am done now, press [Enter] to reboot system ..."   rc_echo -n "I am done now, press [Enter] to reboot system ..."
    848   else   else
    849   rc_echo "Aborted, press [Enter] to reboot system ..."   rc_echo -n "Aborted, press [Enter] to reboot system ..."
    850   fi   fi
    851   read   read
    852   reboot   sync
    853     mount -oremount,ro /
    854     reboot -f
    855  }  }
    856    
    857  onboot_interface_list()  onboot_interface_list()
    Legend:
    Removed from v.3457  
    changed lines
      Added in v.3467