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 1616 by niro, Mon Dec 6 09:18:06 2010 UTC revision 1715 by niro, Tue Jan 25 09:36:42 2011 UTC
    # Line 154  get_system_serial() Line 154  get_system_serial()
    154   if [[ ${ALX_FORCED_RECHECK} = true ]]   if [[ ${ALX_FORCED_RECHECK} = true ]]
    155   then   then
    156   echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}   echo -e ${COLMAGENTA}"Hardware autodetection forced by system-administrator"${COLDEFAULT}
    157     # always disable CONFD_NETWORKING here
    158     export ALX_CONFD_NETWORKING="false"
    159   else   else
    160   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
    161   fi   fi
    # Line 566  import_settings_local() Line 568  import_settings_local()
    568   #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}   #[ ! -d ${SETTINGSPATH} ] && install -d ${SETTINGSPATH}
    569   #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules   #echo "${NETCARD_DRIVER}" > ${SETTINGSPATH}/modules
    570    
    571   # set an device alias for modprobe.conf   # set an device alias for modprobe.conf and modules.conf
    572   [ ! -d /etc/modules.d ] && install -d /etc/modules.d   [ ! -d /etc/modules.d ] && install -d /etc/modules.d
    573     [ ! -d /etc/modprobe.d ] && install -d /etc/modprobe.d
    574   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0   echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modules.d/net.eth0
    575     echo "alias eth0 ${NETCARD_DRIVER}" > /etc/modprobe.d/net.eth0
    576    
    577   # regenerate modprobe.conf   # regenerate modprobe.conf
    578   [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"   [ -x $(which modules-update) ] && modules-update || echo "cannot regen modprobe.conf"
    # Line 578  import_settings_local() Line 582  import_settings_local()
    582   # set system state to 'already configured'   # set system state to 'already configured'
    583   touch /etc/alxconfig-ng/state/configured   touch /etc/alxconfig-ng/state/configured
    584    
    585     # install slim desktopmanager configuration
    586     cat ${ALX_SKELETONS}/slim/slim.conf > /etc/slim.conf
    587     sed -i "s:@@USERNAME@@:${ALX_UNPRIV_USER}:" /etc/slim.conf
    588    
    589     # install a sane xinitrc
    590     echo "exec startfluxbox" > ${ALX_UNPRIV_HOME}/.xinitrc
    591    
    592   # if only an recheck was forced than abort now   # if only an recheck was forced than abort now
    593   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0   [[ ${ALX_FORCED_RECHECK} = true ]] && return 0
    594    
    Legend:
    Removed from v.1616  
    changed lines
      Added in v.1715