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 2156 by niro, Tue May 17 21:41:48 2011 UTC revision 3467 by niro, Fri Apr 13 17:29:18 2012 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 51  unset ALX_SERIAL ALX_STATE Line 52  unset ALX_SERIAL ALX_STATE
    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    
       
     # read_cmdline ${item}  
     read_cmdline()  
     {  
      local i  
       
      for i in $(< /proc/cmdline)  
      do  
      [[ ${i} = $1 ]] && return 0  
      done  
       
      return 1  
     }  
       
    55  update_system_settings()  update_system_settings()
    56  {  {
    57   rc_mecho Checking system setup ...   rc_mecho Checking system setup ...
    # Line 73  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 97  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 139  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 165  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 178  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 202  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 233  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 253  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 434  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 565  import_settings_local() Line 567  import_settings_local()
    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!"
    # Line 588  import_settings_local() Line 599  import_settings_local()
    599   # now generate fluxbox config files   # now generate fluxbox config files
    600    
    601   # fluxbox main config   # fluxbox main config
    602   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init   local fbinit
    603     if [ -f ${ALX_SKELETONS}/fluxbox/init ]
    604     then
    605     fbinit="${ALX_SKELETONS}/fluxbox/init"
    606     else
    607     fbinit="/usr/share/fluxbox/init"
    608     fi
    609     cat ${fbinit} > ${ALX_UNPRIV_HOME}/.fluxbox/init
    610    
    611   # fluxbox autostart   # fluxbox autostart
    612   cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps   CONFIG="${ALX_UNPRIV_HOME}/.fluxbox/apps"
    613     # do not show decorations on messages generated with xmessage
    614     if [ -x /usr/bin/xmessage ]
    615     then
    616     addconfig '[app] (xmessage)'
    617     addconfig ' [Deco] {NONE}'
    618     addconfig '[end]'
    619     fi
    620     # add icon utility
    621     [ -x /usr/bin/idesk ] && addconfig '[startup] {nohup idesk > /dev/null &}'
    622     # add numlock utility
    623     [ -x /usr/bin/numlockx ] && addconfig '[startup] {nohup numlockx on &}'
    624    
    625     # fluxbox hotkeys
    626     local fbkeys
    627     if [ -f ${ALX_SKELETONS}/fluxbox/keys ]
    628     then
    629     fbkeys="${ALX_SKELETONS}/fluxbox/keys"
    630     else
    631     fbkeys="/usr/share/fluxbox/keys"
    632     fi
    633     cat ${fbkeys} > ${ALX_UNPRIV_HOME}/.fluxbox/keys
    634    
    635   # fluxbox menu header   # fluxbox menu header
    636   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
    # Line 609  import_settings_local() Line 648  import_settings_local()
    648   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    649   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    650    
       
    651   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    652   # clean desktop icon location   # clean desktop icon location
    653   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.idesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.idesktop
    654   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.idesktop
    655    
    656     # add shutdown, reboot icons
    657     local name
    658     # default settings
    659     declare -i x=30
    660     declare -i y=30
    661     for i in shutdown reboot
    662     do
    663     case ${i} in
    664     shutdown) name="Herunterfahren" ;;
    665     reboot) name="Neustarten" ;;
    666     esac
    667    
    668     generate_icon \
    669     --name "${name}" \
    670     --command "/usr/lib/alxconfig-ng/bin/user_${i}.sh" \
    671     --icon "${ALX_SESSIONS_ICONS}/${i}.png" \
    672     --dest "${dest}/${i}.lnk" \
    673     --xres "${x}" \
    674     --yres "${y}"
    675    
    676     y=$((${y} + 80))
    677     done
    678    
    679   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    680   local sysinfo   local sysinfo
    # Line 638  import_settings_local() Line 696  import_settings_local()
    696   --name "${sysinfo}" \   --name "${sysinfo}" \
    697   --command "exit 0" \   --command "exit 0" \
    698   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    699   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${ALX_UNPRIV_HOME}/.idesktop/sysinfo.lnk" \
    700   --xres "${xres}" \   --xres "${xres}" \
    701   --yres "${yres}" \   --yres "${yres}" \
    702   --icon-width "1" \   --icon-width "1" \
    703   --icon-height "1"   --icon-height "1"
    704    
      # create a xinitrc  
      echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc  
       
    705   # set correct permissions   # set correct permissions
    706   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    707   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    708   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    709   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    710   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   if [ -f ${ALX_UNPRIV_HOME}/.ideskrc ]
    711   chmod 0644 ${ALX_UNPRIV_HOME}/.xinitrc   then
    712     chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
    713     fi
    714  }  }
    715    
    716  # start|stop  # start|stop
    # Line 702  preliminary_network() Line 759  preliminary_network()
    759   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
    760   else   else
    761   rc_print "Starting default dhcp based networking ... "   rc_print "Starting default dhcp based networking ... "
    762   ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null   ${ALX_DHCP_PROG} ${ALX_DHCP_START} ${ALX_IFACE} &> /dev/null
    763   evaluate_retval   evaluate_retval
    764   fi   fi
    765   ;;   ;;
    # Line 733  preliminary_network() Line 790  preliminary_network()
    790  reset_system_settings()  reset_system_settings()
    791  {  {
    792   # force load of de kbdkeys   # force load of de kbdkeys
    793   loadkeys -q de   [ -x /usr/bin/loadkeys ] && loadkeys -q de
    794     [ -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 rm   find ${ALX_ICA_SESSIONS} -type f -name '*.ica' | xargs --no-run-if-empty rm
    836    
    837   # remove all old nics and modules configs   # remove all old nics and modules configs
    838   find /etc/conf.d -type f -name 'net.*' | xargs rm   find /etc/conf.d -type f -name 'net.*' | xargs --no-run-if-empty rm
    839   find /etc/modprobe.d -type f -name 'net.*' | xargs rm   find /etc/modprobe.d -type f -name 'net.*' | xargs --no-run-if-empty rm
    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.2156  
    changed lines
      Added in v.3467