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 2479 by niro, Mon Jun 27 15:20:33 2011 UTC revision 4834 by niro, Mon May 13 11:12:37 2013 UTC
    # Line 26  source $rc_functions Line 26  source $rc_functions
    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/common  source ${ALX_FUNCTIONS}/common
    30  source /usr/lib/alxconfig-ng/functions/mysqlfunctions  source ${ALX_FUNCTIONS}/mysqlfunctions
    31  source /usr/lib/alxconfig-ng/functions/serial_functions  source ${ALX_FUNCTIONS}/serial_functions
    32  source /usr/lib/alxconfig-ng/functions/config_modules  source ${ALX_FUNCTIONS}/config_modules
    33  source /usr/lib/alxconfig-ng/functions/config_network  source ${ALX_FUNCTIONS}/config_plugins
    34  source /usr/lib/alxconfig-ng/functions/config_printers  source ${ALX_FUNCTIONS}/config_network
    35  source /usr/lib/alxconfig-ng/functions/config_sessions  source ${ALX_FUNCTIONS}/config_printers
    36  source /usr/lib/alxconfig-ng/functions/config_x11  source ${ALX_FUNCTIONS}/config_sessions
    37  source /usr/lib/alxconfig-ng/functions/config_auth  source ${ALX_FUNCTIONS}/config_x11
    38  source /usr/lib/alxconfig-ng/functions/config_ssh_auth  source ${ALX_FUNCTIONS}/config_auth
    39  source /usr/lib/alxconfig-ng/functions/config_versions  source ${ALX_FUNCTIONS}/config_ssh_auth
    40    source ${ALX_FUNCTIONS}/config_versions
    41    
    42  # other needed vars  # other needed vars
    43  ALX_HW_DETECT=false  ALX_HW_DETECT=false
    # Line 59  update_system_settings() Line 60  update_system_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 83  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 117  get_system_serial() Line 122  get_system_serial()
    122   # nice serial output   # nice serial output
    123   $CURS_UP   $CURS_UP
    124   $SET_WCOL   $SET_WCOL
    125   echo "[ SN: ${ALX_SERIAL} ]"   rc_echo "[ SN: ${ALX_SERIAL} ]"
    126    
    127   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
    128   then   then
    # Line 125  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
    139    
    140   else   else
    141   # run hardware detection   # run hardware detection
    142   echo   rc_echo
    143   if [[ ${ALX_FORCED_RECHECK} = true ]]   if [[ ${ALX_FORCED_RECHECK} = true ]]
    144   then   then
    145   rc_mecho "Hardware autodetection forced by system-administrator"   rc_mecho "Hardware autodetection forced by system-administrator"
    # Line 151  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 164  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')
    177   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
      CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)  
    178   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    179    
    180   # abort now if this is a forced re-check   # abort now if this is a forced re-check
    # Line 180  get_system_serial() Line 188  get_system_serial()
    188   # nice serial output   # nice serial output
    189   $CURS_UP   $CURS_UP
    190   $SET_WCOL   $SET_WCOL
    191   echo "[ SN: ${ALX_SERIAL} ]"   rc_echo "[ SN: ${ALX_SERIAL} ]"
    192    
    193   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"   if validate_serial "${ALX_SERIAL}" "${ALX_REG_DATE}" "${CUR_MAC}"
    194   then   then
    # Line 188  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 214  get_system_serial() Line 226  get_system_serial()
    226   # nice serial output   # nice serial output
    227   $CURS_UP   $CURS_UP
    228   $SET_WCOL   $SET_WCOL
    229   echo "[ SN: ${ALX_SERIAL} ]"   rc_echo "[ SN: ${ALX_SERIAL} ]"
    230    
    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 234  get_system_serial() Line 248  get_system_serial()
    248   # nice serial output   # nice serial output
    249   $CURS_UP   $CURS_UP
    250   $SET_WCOL   $SET_WCOL
    251   echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"   rc_echo -e "[ SN: ${COLRED}None, 0${COLDEFAULT} ]"
    252   fi   fi
    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 274  import_settings_to_db() Line 290  import_settings_to_db()
    290   source /etc/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    291   source /etc/conf.d/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    292    
    293   echo   rc_echo
    294   rc_mecho "Importing detected settings to database"   rc_mecho "Importing detected settings to database"
    295    
    296   # network   # network
    # Line 420  import_settings_to_db() Line 436  import_settings_to_db()
    436   local alx_os   local alx_os
    437   local alx_utils   local alx_utils
    438   alx_os="$(< /etc/mageversion)"   alx_os="$(< /etc/mageversion)"
    439   alx_utils="$(magequery -n alxconfig-ng-alx | sed 's:.*\[\ \(.*\)\ \].*:\1:')"   alx_utils="$(magequery -n alxconfig-ng | sed 's:.*\[\ \(.*\)\ \].*:\1:')"
    440   alx_utils="${alx_utils/alxconfig-ng-alx-}"   alx_utils="${alx_utils/alxconfig-ng-}"
    441   mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"   mysqldo "insert into client_version(serial,os,utils) values('${ALX_SERIAL}','${alx_os}','${alx_utils}')"
    442    
    443   evaluate_retval   evaluate_retval
    # Line 447  update_settings_in_db() Line 463  update_settings_in_db()
    463   source /etc/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    464   source /etc/conf.d/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    465    
    466   echo   rc_echo
    467   rc_mecho "Updating detected settings in database"   rc_mecho "Updating detected settings in database"
    468    
    469   # network   # network
    # Line 544  import_settings_local() Line 560  import_settings_local()
    560   # get setting from hwsetup   # get setting from hwsetup
    561   source /etc/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    562    
    563   echo   rc_echo
    564   rc_mecho "Importing detected settings to local system"   rc_mecho "Importing detected settings to local system"
    565    
    566   if [[ ${ALX_CONFD_NETWORKING} = false ]]   if [[ ${ALX_CONFD_NETWORKING} = false ]]
    567   then   then
    568   # set an device alias for modprobe.conf   # set an device alias for modprobe.conf
    569   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
    570   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf   # update only if not the same (to speed up bootprocess - no depmod)
    571     CONFIG="/etc/modprobe.d/net.${ALX_IFACE}.conf"
    572     clearconfig
    573     addconfig "alias ${ALX_IFACE} ${cfg_network_module}"
    574    
    575     # update confd-networking default iface
    576     [ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
    577     CONFIG="${SETTINGSPATH}/confd-networking"
    578     clearconfig
    579     addconfig "${ALX_IFACE}"
    580    
    581   # regenerate modprobe.conf   # regenerate modprobe.conf
    582   [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"   [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"
    583   evaluate_retval   evaluate_retval
    584    
    585     # restore default networking if hardware-detection was called by administrator and iface config is empty
    586     if [[ ${ALX_FORCED_RECHECK} =  true ]] && [ ! -s /etc/conf.d/net.${ALX_IFACE} ] && [ -f ${SETTINGSPATH}/confd-networking ]
    587     then
    588     rc_echo "   Network config is empty, using default skeleton"
    589     cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.${ALX_IFACE}
    590     fi
    591   fi   fi
    592    
    593   # set system state to 'already configured'   # set system state to 'already configured'
    # Line 734  preliminary_network() Line 766  preliminary_network()
    766   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
    767   else   else
    768   rc_print "Starting default dhcp based networking ... "   rc_print "Starting default dhcp based networking ... "
    769   ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null   ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null
    770   evaluate_retval   evaluate_retval
    771   fi   fi
    772   ;;   ;;
    # Line 757  preliminary_network() Line 789  preliminary_network()
    789   ;;   ;;
    790    
    791   *)   *)
    792   echo "Usage: preliminary_network {start|stop}"   rc_echo "Usage: preliminary_network {start|stop}"
    793   ;;   ;;
    794   esac   esac
    795  }  }
    # Line 765  preliminary_network() Line 797  preliminary_network()
    797  reset_system_settings()  reset_system_settings()
    798  {  {
    799   # force load of de kbdkeys   # force load of de kbdkeys
    800   loadkeys -q de   [ -x /usr/bin/loadkeys ] && loadkeys -q de
    801     [ -x /sbin/loadkmap ] && loadkmap < /usr/share/busybox/keymaps/de.kmap
    802   rc_echo   rc_echo
    803   rc_echo -en ${COLRED}   rc_echo -en "${COLRED}"
    804   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!'
    805   rc_echo -e ${COLDEFAULT}   rc_echo -e "${COLDEFAULT}"
    806   rc_echo "*** Do you really want to continue ?"   rc_echo '--- Do you really want to continue ?'
    807   rc_echo -n "*** Enter 'yes' to continue, anything else to abort: "   rc_echo -n '--- Enter 'yes' to continue, anything else to abort: '
    808   read kbinsert   read kbinsert
    809   if [[ ${kbinsert} = yes ]]   if [[ ${kbinsert} = yes ]]
    810   then   then
    811   rc_echo -en ${COLRED}   rc_echo -en "${COLRED}"
    812   rc_echo -n "*** OK, you really want it ... killing all settings: "   rc_echo -n '--- OK, you really want it ... killing all settings: '
    813   for i in 3 2 1 now   for i in 3 2 1 now
    814   do   do
    815   rc_echo -n " ${i}"   rc_echo -n " ${i}"
    816   sleep 1   sleep 1
    817   done   done
    818   rc_echo -e ${COLDEFAULT}   rc_echo -e "${COLDEFAULT}"
    819    
    820   ## reset all settings:   ## reset all settings:
    821   rm -rf ${SETTINGSPATH}/*   rm -rf ${SETTINGSPATH}
    822   rm -f /etc/alxconfig-ng/serial   rm -f /etc/alxconfig-ng/serial
    823   rm -rf /etc/alxconfig-ng/state   rm -rf /etc/alxconfig-ng/state
    824     local i
    825     for i in xserver netcard knoppix mouse
    826     do
    827     [[ -f /etc/conf.d/hwsetup/${i} ]] && rm /etc/conf.d/hwsetup/${i}
    828     done
    829    
    830   # clear all printers & net-shares   # clear all printers & net-shares
    831   :> /etc/printcap   :> /etc/printcap
    832    
    833   # remove lprng   # remove lprng
    834   rc-config del lprng &> /dev/null   rc-config del lprng &> /dev/null
    835     rc-config del nmbd &> /dev/null
    836    
    837   # remove all user settings   # remove all user settings
    838   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
    839     install -o ${ALX_UNPRIV_USER} -g ${ALX_UNPRIV_GROUP} -d ${ALX_UNPRIV_HOME}
    840    
    841   # remove all ica-sessions   # remove all ica-sessions
    842   find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs rm   find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm
    843    
    844   # remove all old nics and modules configs   # remove all old nics and modules configs
    845   find /etc/conf.d -type f -name 'net.*' | xargs rm   find /etc/conf.d -type f -name 'net.*' | xargs --no-run-if-empty rm
    846   find /etc/modprobe.d -type f -name 'net.*' | xargs rm   find /etc/modprobe.d -type f -name 'net.*' | xargs --no-run-if-empty rm
    847    
    848   # restore default networking   # restore default networking
    849   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
    850     local CONFIG="/etc/hostname"
    851     clearconfig
    852     addconfig "${ALX_DEFAULT_HOSTNAME}"
    853    
    854   rc_echo "I am done now, press [Enter] to reboot system ..."   rc_echo -n "I am done now, press [Enter] to reboot system ..."
    855   else   else
    856   rc_echo "Aborted, press [Enter] to reboot system ..."   rc_echo -n "Aborted, press [Enter] to reboot system ..."
    857   fi   fi
    858   read   read
    859   reboot   sync
    860     mount -oremount,ro /
    861     reboot -f
    862  }  }
    863    
    864  onboot_interface_list()  onboot_interface_list()
    # Line 940  case $1 in Line 985  case $1 in
    985   ;;   ;;
    986    
    987   *)   *)
    988   echo "Usage: $0 {start|stop} ..."   rc_echo "Usage: $0 {start|stop} ..."
    989   ;;   ;;
    990  esac  esac
    Legend:
    Removed from v.2479  
    changed lines
      Added in v.4834