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

    alx-src/branches/alxconf_20060908/init.d/alxsettings revision 1715 by niro, Tue Jan 25 09:36:42 2011 UTC alx-src/branches/alxconf-060/init.d/alxsettings revision 2455 by niro, Mon Jun 27 12:47:52 2011 UTC
    # Line 1  Line 1 
    1  #!/bin/bash  #!/bin/bash
    2    # $Id$
    3  # <niro@magellan-linux.de>  # <niro@magellan-linux.de>
    4    
    5  #%rlevels: 7:s 0:k 6:k  #%rlevels: 7:s 0:k
    6  #%start: 41  #%start: 41
    7  #%stop: 01  #%stop: 01
    8    
    # Line 11  Line 11 
    11  #%before:  #%before:
    12  #%after:  #%after:
    13    
     # $Header: /home/cvsd/alx-cvs/alx-src/alxconfig-ng/init.d/alxsettings,v 1.27 2005-10-11 12:10:15 niro Exp $  
       
    14  # 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
    15  # if not it runs the autoconfiguration script  # if not it runs the autoconfiguration script
    16  # these settings will be used for client setup  # these settings will be used for client setup
    # Line 21  Line 19 
    19  # if no changes are at server side they will be kept, if yes the get updated.  # if no changes are at server side they will be kept, if yes the get updated.
    20  # the server settings has higher priority.  # the server settings has higher priority.
    21    
    22  source /etc/sysconfig/rc  source /etc/conf.d/rc
    23  source $rc_functions  source $rc_functions
    24    
    25  # mysql settings  # mysql settings
    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
    30  source /usr/lib/alxconfig-ng/functions/mysqlfunctions  source /usr/lib/alxconfig-ng/functions/mysqlfunctions
    31  source /usr/lib/alxconfig-ng/functions/serial_functions  source /usr/lib/alxconfig-ng/functions/serial_functions
    32  source /usr/lib/alxconfig-ng/functions/config_modules  source /usr/lib/alxconfig-ng/functions/config_modules
    # Line 39  source /usr/lib/alxconfig-ng/functions/c Line 38  source /usr/lib/alxconfig-ng/functions/c
    38  source /usr/lib/alxconfig-ng/functions/config_ssh_auth  source /usr/lib/alxconfig-ng/functions/config_ssh_auth
    39  source /usr/lib/alxconfig-ng/functions/config_versions  source /usr/lib/alxconfig-ng/functions/config_versions
    40    
     # check if mysql is available  
     [ -x /usr/bin/mysql ] && MYSQL_ALX=true  
       
    41  # other needed vars  # other needed vars
    42  ALX_HW_DETECT=false  ALX_HW_DETECT=false
    43  ALX_FORCED_RECHECK=false  ALX_FORCED_RECHECK=false
    # Line 55  unset ALX_SERIAL ALX_STATE Line 51  unset ALX_SERIAL ALX_STATE
    51  # setup needed directories  # setup needed directories
    52  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state  [ ! -d /etc/alxconfig-ng/state ] && install -d /etc/alxconfig-ng/state
    53    
       
     # read_cmdline ${item}  
     read_cmdline()  
     {  
      local i  
       
      for i in $(< /proc/cmdline)  
      do  
      [[ ${i} = $1 ]] && return 0  
      done  
       
      return 1  
     }  
       
    54  update_system_settings()  update_system_settings()
    55  {  {
    56   echo -e ${COLMAGENTA}"Checking system setup ..."${COLDEFAULT}   rc_mecho Checking system setup ...
    57    
    58   # get the modules settings   # get the modules settings
    59   # ! is the first thing that must be configured !   # ! is the first thing that must be configured !
    # Line 126  get_system_serial() Line 108  get_system_serial()
    108   exit 1   exit 1
    109   fi   fi
    110    
    111   CUR_IP=$(/sbin/ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(ifconfig ${ALX_IFACE} | sed -n '/addr:/s/ [^r]*..//gp')
    112   CUR_MAC=$(/sbin/ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(ifconfig ${ALX_IFACE} | grep HWaddr | cut -d ' ' -f11)
    113   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    114    
    115   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   rc_print "Trying to validate my serial ..."
    116    
    117   # nice serial output   # nice serial output
    118   $CURS_UP   $CURS_UP
    # Line 153  get_system_serial() Line 135  get_system_serial()
    135   echo   echo
    136   if [[ ${ALX_FORCED_RECHECK} = true ]]   if [[ ${ALX_FORCED_RECHECK} = true ]]
    137   then   then
    138   echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}   rc_mecho "Hardware autodetection forced by system-administrator"
    139   # always disable CONFD_NETWORKING here   # always disable CONFD_NETWORKING here
    140   export ALX_CONFD_NETWORKING="false"   export ALX_CONFD_NETWORKING="false"
    141   else   else
    142   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   rc_mecho "Preparing system for first boot"
    143   fi   fi
    144   ALX_HW_DETECT=true   ALX_HW_DETECT=true
    145   /etc/init.d/hwdetect start   hwsetup
    146    
    147   # set hostname to alx_default_hostname   # set hostname to alx_default_hostname
    148   # use old hostname if this is a forced re-check   # use old hostname if this is a forced re-check
    # Line 182  get_system_serial() Line 164  get_system_serial()
    164   exit 1   exit 1
    165   fi   fi
    166    
    167    
    168   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')   CUR_IP=$(/sbin/ifconfig eth0 | sed -n '/addr:/s/ [^r]*..//gp')
    169   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)   CUR_MAC=$(/sbin/ifconfig eth0 | grep HWaddr | cut -d ' ' -f11)
    170   CUR_MTIME=$(date +%s)   CUR_MTIME=$(date +%s)
    # Line 192  get_system_serial() Line 175  get_system_serial()
    175   # but first check the serial   # but first check the serial
    176   source /etc/alxconfig-ng/serial   source /etc/alxconfig-ng/serial
    177    
    178   echo -e ${COLOREDSTAR} "Trying to validate my serial ..."   rc_print "Trying to validate my serial ..."
    179    
    180   # nice serial output   # nice serial output
    181   $CURS_UP   $CURS_UP
    # Line 220  get_system_serial() Line 203  get_system_serial()
    203   return 0   return 0
    204   fi   fi
    205    
    206   echo -e ${COLOREDSTAR} "Trying to get new serial ..."   rc_print "Trying to get new serial ..."
    207    
    208   # request a new serial; one command now (cause must be done in the same session)   # request a new serial; one command now (cause must be done in the same session)
    209   ALX_SERIAL=$(mysqldo "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');   ALX_SERIAL=$(mysqldo "insert into client_serials (mtime, mac) values('${CUR_MTIME}','${CUR_MAC}');
    # Line 282  import_settings_to_db() Line 265  import_settings_to_db()
    265   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    266   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    267    
    268   # vars used by hwdetect   # vars used by hwsetup
    269   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    270   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    271   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    272    
    273   # get setting from hwdetect   # get setting from hwsetup
    274   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    275   source /etc/sysconfig/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    276    
    277   echo   echo
    278   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   rc_mecho "Importing detected settings to database"
    279    
    280   # network   # network
    281   echo -e "      Network settings ..."   rc_mecho "      Network settings ..."
    282   if [[ ${ALX_CONFD_NETWORKING} = true ]]   if [[ ${ALX_CONFD_NETWORKING} = true ]]
    283   then   then
    284   # get settings   # get settings
      #source ${rc_base}/init.d/network &> /dev/null  
    285   for iface in $(onboot_interface_list ${network_settings}/net.*)   for iface in $(onboot_interface_list ${network_settings}/net.*)
    286   do   do
    287   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
    288   echo "WARNING: only importing settings for interface [ ${iface} ] !"   rc_echo "WARNING: only importing settings for interface [ ${iface} ] !"
    289   source ${network_settings}/net.${iface} || exit 1   source ${network_settings}/net.${iface} || echo "Error: could not read '${network_settings}/net.${iface}'"
    290   NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"   NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
    291    
    292   mysqldo "insert into cfg_network(   mysqldo "insert into cfg_network(
    293   hostname,   hostname,
    # Line 376  import_settings_to_db() Line 358  import_settings_to_db()
    358   evaluate_retval   evaluate_retval
    359    
    360   # xserver   # xserver
    361   echo -e "      Graphic settings ..."   rc_mecho "      Graphic settings ..."
    362   # xserver general   # xserver general
    363   ( mysqldo "insert into cfg_graphic(   ( mysqldo "insert into cfg_graphic(
    364   serial,   serial,
    # Line 395  import_settings_to_db() Line 377  import_settings_to_db()
    377   evaluate_retval   evaluate_retval
    378    
    379   # input   # input
    380   echo -e "      Input settings ..."   rc_mecho "      Input settings ..."
    381   mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"   mysqldo "insert into cfg_input(serial,mouse) values('${ALX_SERIAL}','${XMOUSETYPE}');"
    382   evaluate_retval   evaluate_retval
    383    
    384   # auth   # auth
    385   echo -e "      Authentification settings ..."   rc_mecho "      Authentification settings ..."
    386   mysqldo "insert into client_auth(   mysqldo "insert into client_auth(
    387   serial,   serial,
    388   username,   username,
    # Line 421  import_settings_to_db() Line 403  import_settings_to_db()
    403    
    404   # exchange ssh rsa keys - the first boot needs this !   # exchange ssh rsa keys - the first boot needs this !
    405   # or no reboot will work via the webadmin   # or no reboot will work via the webadmin
    406   echo -e "      SSH authentification settings ..."   rc_mecho "      SSH authentification settings ..."
    407   HOME=/root config_ssh_auth   HOME=/root config_ssh_auth
    408   evaluate_retval   evaluate_retval
    409    
    410   # autostart   # autostart
    411   echo -e "      Autostart settings ..."   rc_mecho "      Autostart settings ..."
    412   mysqldo "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"   mysqldo "insert into cfg_autostart(serial,session) values('${ALX_SERIAL}','');"
    413    
    414   # screensaver   # screensaver
    415   echo -e "      Screensaver settings ..."   rc_mecho "      Screensaver settings ..."
    416   mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"   mysqldo "insert into cfg_screensaver(serial,screensaver) values('${ALX_SERIAL}','')"
    417    
    418   # version info   # version info
    419     rc_mecho "      OS version info ..."
    420   local alx_os   local alx_os
    421   local alx_utils   local alx_utils
    422   alx_os="$(< /etc/mageversion)"   alx_os="$(< /etc/mageversion)"
    # Line 455  update_settings_in_db() Line 438  update_settings_in_db()
    438   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    439   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    440    
    441   # vars used by hwdetect   # vars used by hwsetup
    442   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    443   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    444   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    445    
    446   # get setting from hwdetect   # get setting from hwsetup
    447   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    448   source /etc/sysconfig/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    449    
    450   echo   echo
    451   echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}   rc_mecho "Updating detected settings in database"
    452    
    453   # network   # network
    454   echo -e "      Network settings ..."   rc_mecho "      Network settings ..."
    455   if [[ ${ALX_CONFD_NETWORKING} = true ]]   if [[ ${ALX_CONFD_NETWORKING} = true ]]
    456   then   then
    457   # get settings   # get settings
    # Line 476  update_settings_in_db() Line 459  update_settings_in_db()
    459   for iface in $(onboot_interface_list ${network_settings}/net.*)   for iface in $(onboot_interface_list ${network_settings}/net.*)
    460   do   do
    461   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue   [[ $(< ${SETTINGSPATH}/confd-networking) != ${iface} ]] && continue
    462   echo "WARNING: only importing settings for interface [ ${iface} ] !"   rc_echo "WARNING: only importing settings for interface [ ${iface} ] !"
    463   source ${network_settings}/net.${iface} || exit 1   source ${network_settings}/net.${iface} || exit 1
    464   NETCARD_DRIVER="$(cat /etc/modules.d/net.${iface} | cut -d' ' -f3)"   NETCARD_DRIVER="$(cat /etc/modprobe.d/net.${iface}.conf | cut -d' ' -f3)"
    465    
    466   mysqldo "update cfg_network set   mysqldo "update cfg_network set
    467   hostname='${ALX_DEFAULT_HOSTNAME}',   hostname='${ALX_DEFAULT_HOSTNAME}',
    # Line 517  update_settings_in_db() Line 500  update_settings_in_db()
    500   evaluate_retval   evaluate_retval
    501    
    502   # xserver   # xserver
    503   echo -e "      Graphic settings ..."   rc_mecho "      Graphic settings ..."
    504   # xserver general   # xserver general
    505   mysqldo "update cfg_graphic set   mysqldo "update cfg_graphic set
    506   module='${XMODULE}',   module='${XMODULE}',
    # Line 528  update_settings_in_db() Line 511  update_settings_in_db()
    511   evaluate_retval   evaluate_retval
    512    
    513   # input   # input
    514   echo -e "      Input settings ..."   rc_mecho "      Input settings ..."
    515   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"   mysqldo "update cfg_input set mouse='${XMOUSETYPE}' where serial=${ALX_SERIAL};"
    516   evaluate_retval   evaluate_retval
    517    
    518   # version info   # version info
    519     rc_mecho "      OS version info ..."
    520   local alx_os   local alx_os
    521   local alx_utils   local alx_utils
    522   alx_os="$(< /etc/mageversion)"   alx_os="$(< /etc/mageversion)"
    # Line 552  import_settings_local() Line 536  import_settings_local()
    536   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    537   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    538    
    539   # vars used by hwdetect   # vars used by hwsetup
    540   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    541   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    542   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    543    
    544   # get setting from hwdetect   # get setting from hwsetup
    545   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    546    
    547   echo   echo
    548   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}   rc_mecho "Importing detected settings to local system"
    549    
    550   if [[ ${ALX_CONFD_NETWORKING} = false ]]   if [[ ${ALX_CONFD_NETWORKING} = false ]]
    551   then   then
    552   #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}   # set an device alias for modprobe.conf
      #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules  
       
      # set an device alias for modprobe.conf and modules.conf  
      [ ! -d /etc/modules.d ] && install -d /etc/modules.d  
    553   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d   [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
    554   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0.conf
      echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0  
    555    
    556   # regenerate modprobe.conf   # regenerate modprobe.conf
    557   [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"   [ -x $(which modules-update) ] && modules-update || rc_echo "modules-update not found!"
    558   evaluate_retval   evaluate_retval
    559   fi   fi
    560    
    # Line 583  import_settings_local() Line 562  import_settings_local()
    562   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
    563    
    564   # install slim desktopmanager configuration   # install slim desktopmanager configuration
    565   cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf   config_display_manager
      sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf  
       
      # install a sane xinitrc  
      echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc  
    566    
    567   # if only an recheck was forced than abort now   # if only an recheck was forced than abort now
    568   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0
    # Line 599  import_settings_local() Line 574  import_settings_local()
    574   # now generate fluxbox config files   # now generate fluxbox config files
    575    
    576   # fluxbox main config   # fluxbox main config
    577   cat ${ALX_SKELETONS}/fluxbox/init \   cat ${ALX_SKELETONS}/fluxbox/init > ${ALX_UNPRIV_HOME}/.fluxbox/init
      > ${ALX_UNPRIV_HOME}/.fluxbox/init  
    578    
    579   # fluxbox autostart   # fluxbox autostart
    580   cat ${ALX_SKELETONS}/fluxbox/apps \   cat ${ALX_SKELETONS}/fluxbox/apps > ${ALX_UNPRIV_HOME}/.fluxbox/apps
      > ${ALX_UNPRIV_HOME}/.fluxbox/apps  
    581    
    582   # fluxbox menu header   # fluxbox menu header
    583   cat ${ALX_SKELETONS}/fluxbox/menu.header \   cat ${ALX_SKELETONS}/fluxbox/menu.header > ${ALX_UNPRIV_HOME}/.fluxbox/menu
      > ${ALX_UNPRIV_HOME}/.fluxbox/menu  
    584    
    585   # now fix it with proper messages :P   # now fix it with proper messages :P
    586   local ver="$(< /etc/mageversion)"   local ver="$(< /etc/mageversion)"
    587   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" \   sed -i "s:@CHANGEME@:alx-${ver}  #${ALX_SERIAL}:g" ${ALX_UNPRIV_HOME}/.fluxbox/menu
      ${ALX_UNPRIV_HOME}/.fluxbox/menu  
    588    
    589   # add a newline (maybe there is no crlf in the header)   # add a newline (maybe there is no crlf in the header)
    590   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    591    
    592   # fluxbox menu footer   # fluxbox menu footer
    593   cat ${ALX_SKELETONS}/fluxbox/menu.footer \   cat ${ALX_SKELETONS}/fluxbox/menu.footer >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
      >> ${ALX_UNPRIV_HOME}/.fluxbox/menu  
    594    
    595   # add a newline (maybe there is no crlf in the footer)   # add a newline (maybe there is no crlf in the footer)
    596   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu   echo >> ${ALX_UNPRIV_HOME}/.fluxbox/menu
    597    
       
    598   # setup some standart icons (sysinfo.lnk)   # setup some standart icons (sysinfo.lnk)
      # basic config  
      cat ${ALX_SKELETONS}/xtdesktop/xtdeskrc > ${ALX_UNPRIV_HOME}/.xtdeskrc  
       
    599   # clean desktop icon location   # clean desktop icon location
    600   [ -d ${ALX_UNPRIV_HOME}/.xtdesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.xtdesktop   [ -d ${ALX_UNPRIV_HOME}/.idesktop ] && rm -rf ${ALX_UNPRIV_HOME}/.idesktop
    601   install -d ${ALX_UNPRIV_HOME}/.xtdesktop   install -d ${ALX_UNPRIV_HOME}/.idesktop
    602    
    603   # last but not least gen a icon with some sys informations   # last but not least gen a icon with some sys informations
    604   local sysinfo   local sysinfo
    # Line 654  import_settings_local() Line 620  import_settings_local()
    620   --name "${sysinfo}" \   --name "${sysinfo}" \
    621   --command "exit 0" \   --command "exit 0" \
    622   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \   --icon "${ALX_SESSIONS_ICONS}/sysinfo.png" \
    623   --dest "${ALX_UNPRIV_HOME}/.xtdesktop/sysinfo.lnk" \   --dest "${ALX_UNPRIV_HOME}/.idesktop/sysinfo.lnk" \
    624   --xres "${xres}" \   --xres "${xres}" \
    625   --yres "${yres}" \   --yres "${yres}" \
    626   --icon-width "1" \   --icon-width "1" \
    627   --icon-height "1"   --icon-height "1"
    628    
      # create a xinitrc  
      echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc  
       
    629   # set correct permissions   # set correct permissions
    630   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}
    631   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox   chown ${ALX_UNPRIV_USER}:${ALX_UNPRIV_GROUP} ${ALX_UNPRIV_HOME}/.fluxbox
    632   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox   chmod 0755 ${ALX_UNPRIV_HOME}/.fluxbox
    633   chmod 0755 ${ALX_UNPRIV_HOME}/.xtdesktop   chmod 0755 ${ALX_UNPRIV_HOME}/.idesktop
    634   chmod 0644 ${ALX_UNPRIV_HOME}/.xtdeskrc   chmod 0644 ${ALX_UNPRIV_HOME}/.ideskrc
      chmod 0644 ${ALX_UNPRIV_HOME}/.xinitrc  
    635  }  }
    636    
    637  # start|stop  # start|stop
    # Line 686  preliminary_network() Line 648  preliminary_network()
    648   module=$(cat ${SETTINGSPATH}/modules)   module=$(cat ${SETTINGSPATH}/modules)
    649   modprobe ${module}   modprobe ${module}
    650   fi   fi
    651    
    652   else   else
    653   # vars used by hwdetect   # vars used by hwsetup
    654   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    655   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    656    
    657   # get setting from hwdetect   # get setting from hwsetup
    658   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    659   modprobe ${NETCARD_DRIVER}   modprobe ${NETCARD_DRIVER}
    660   fi   fi
    661    
    # Line 701  preliminary_network() Line 664  preliminary_network()
    664   # keeping like always safe:   # keeping like always safe:
    665   # no network should be startet here,   # no network should be startet here,
    666   # so we can delete all pid files if one exists   # so we can delete all pid files if one exists
    667   if ps -A|grep dhcpcd > /dev/null   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
    668   then   then
    669   echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}   rc_mecho "Forcing network down"
    670   dhcpcd -k   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
    671   sleep 1   sleep 1
      else  
      rm -f /var/run/dhcpcd-eth?.pid  
    672   fi   fi
    673   [[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \   [[ ${ALX_CONFD_NETWORKING} = true ]] && ${rc_base}/init.d/network stop
      ${rc_base}/init.d/network stop  
    674    
    675   echo -e ${COLMAGENTA}"Starting preliminary networking ... "${COLDEFAULT}   rc_mecho "Starting preliminary networking ... "
    676    
    677   # start network configured from /etc/conf.d   # start network configured from /etc/conf.d
    678   if [[ ${ALX_CONFD_NETWORKING} = true ]]   if [[ ${ALX_CONFD_NETWORKING} = true ]]
    679   then   then
    680   ${rc_base}/init.d/network start   ${rc_base}/init.d/network start
    681   else   else
    682   echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}   rc_print "Starting default dhcp based networking ... "
    683   # -t 10 timeout of 10 secs   ${ALX_DHCP_PROG} ${ALX_DHCP_START} &> /dev/null
      dhcpcd -t 10 &> /dev/null  
    684   evaluate_retval   evaluate_retval
    685   fi   fi
    686   ;;   ;;
    687    
    688   stop)   stop)
    689   echo -e ${COLMAGENTA}"Stopping preliminary networking ... "${COLDEFAULT}   rc_mecho "Stopping preliminary networking ... "
    690   if [[ ${ALX_CONFD_NETWORKING} = true ]]   if [[ ${ALX_CONFD_NETWORKING} = true ]]
    691   then   then
    692   ${rc_base}/init.d/network stop   ${rc_base}/init.d/network stop
    693   else   else
    694   echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}   rc_print "Stopping default dhcp based networking ... "
    695   ifconfig eth0 down   ifconfig ${ALX_IFACE} down
    696   fi   fi
    697   if ps -A|grep dhcpcd > /dev/null   if [[ ! -z $(pidof $(basename ${ALX_DHCP_PROG})) ]]
    698   then   then
    699   dhcpcd -z  &> /dev/null   killall $(basename ${ALX_DHCP_PROG}) &> /dev/null
    700   sleep 1   sleep 1
    701   fi   fi
    702   evaluate_retval   evaluate_retval
    # Line 753  reset_system_settings() Line 712  reset_system_settings()
    712  {  {
    713   # force load of de kbdkeys   # force load of de kbdkeys
    714   loadkeys -q de   loadkeys -q de
    715   echo   rc_echo
    716   echo -en ${COLRED}   rc_echo -en ${COLRED}
    717   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!"
    718   echo -e ${COLDEFAULT}   rc_echo -e ${COLDEFAULT}
    719   echo "*** Do you really want to continue ?"   rc_echo "*** Do you really want to continue ?"
    720   echo -n "*** Enter 'yes' to continue, anything else to abort: "   rc_echo -n "*** Enter 'yes' to continue, anything else to abort: "
    721   read kbinsert   read kbinsert
    722   if [[ ${kbinsert} = yes ]]   if [[ ${kbinsert} = yes ]]
    723   then   then
    724   echo -en ${COLRED}   rc_echo -en ${COLRED}
    725   echo -n "*** OK, you really want it ... killing all settings: "   rc_echo -n "*** OK, you really want it ... killing all settings: "
    726   for i in 3 2 1 now   for i in 3 2 1 now
    727   do   do
    728   echo -n " ${i}"   rc_echo -n " ${i}"
    729   sleep 1   sleep 1
    730   done   done
    731   echo -e ${COLDEFAULT}   rc_echo -e ${COLDEFAULT}
    732    
    733   ## reset all settings:   ## reset all settings:
    734   rm -rf ${SETTINGSPATH}/*   rm -rf ${SETTINGSPATH}/*
    # Line 777  reset_system_settings() Line 736  reset_system_settings()
    736   rm -rf /etc/alxconfig-ng/state   rm -rf /etc/alxconfig-ng/state
    737    
    738   # clear all printers & net-shares   # clear all printers & net-shares
    739   :> /etc/cups/printers.conf   :> /etc/printcap
      :> /etc/samba/smb.conf  
    740    
    741   # remove inetd, cups & smb from init   # remove lprng
    742   rc-config del inetd &> /dev/null   rc-config del lprng &> /dev/null
      rc-config del cups &> /dev/null  
      rc-config del samba &> /dev/null  
    743    
    744   # remove all user settings   # remove all user settings
    745   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}   [ -d ${ALX_UNPRIV_HOME} ] && rm -rf ${ALX_UNPRIV_HOME}
    # Line 793  reset_system_settings() Line 749  reset_system_settings()
    749    
    750   # remove all old nics and modules configs   # remove all old nics and modules configs
    751   find /etc/conf.d -type f -name 'net.*' | xargs rm   find /etc/conf.d -type f -name 'net.*' | xargs rm
    752   find /etc/modules.d -type f -name 'net.*' | xargs rm   find /etc/modprobe.d -type f -name 'net.*' | xargs rm
    753    
    754   # restore default networking   # restore default networking
    755   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0   cat ${ALX_SKELETONS}/net/net.eth0 > /etc/conf.d/net.eth0
    756    
    757   echo "I am done now, press [Enter] to reboot system ..."   rc_echo "I am done now, press [Enter] to reboot system ..."
    758   else   else
    759   echo "Aborted, press [Enter] to reboot system ..."   rc_echo "Aborted, press [Enter] to reboot system ..."
    760   fi   fi
    761   read   read
    762   reboot   reboot
    # Line 928  case $1 in Line 884  case $1 in
    884   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state   [ -f /etc/alxconfig-ng/state/state ] && rm /etc/alxconfig-ng/state/state
    885   sleep 0.1   sleep 0.1
    886   ;;   ;;
    887    
    888   *)   *)
    889   echo "Usage: $0 {start|stop} ..."   echo "Usage: $0 {start|stop} ..."
    890   ;;   ;;
    891  esac  esac
       
    Legend:
    Removed from v.1715  
    changed lines
      Added in v.2455