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 2007 by niro, Mon May 9 15:31:56 2011 UTC revision 2014 by niro, Mon May 9 16:01:06 2011 UTC
    # Line 155  get_system_serial() Line 155  get_system_serial()
    155   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}   echo -e ${COLMAGENTA}"Preparing system for first boot"${COLDEFAULT}
    156   fi   fi
    157   ALX_HW_DETECT=true   ALX_HW_DETECT=true
    158   /etc/init.d/hwdetect start   hwsetup
    159    
    160   # set hostname to alx_default_hostname   # set hostname to alx_default_hostname
    161   # use old hostname if this is a forced re-check   # use old hostname if this is a forced re-check
    # Line 277  import_settings_to_db() Line 277  import_settings_to_db()
    277   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    278   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    279    
    280   # vars used by hwdetect   # vars used by hwsetup
    281   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    282   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    283   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    284    
    285   # get setting from hwdetect   # get setting from hwsetup
    286   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    287   source /etc/sysconfig/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    288    
    289   echo   echo
    290   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to database"${COLDEFAULT}
    # Line 450  update_settings_in_db() Line 450  update_settings_in_db()
    450   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    451   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    452    
    453   # vars used by hwdetect   # vars used by hwsetup
    454   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    455   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    456   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    457    
    458   # get setting from hwdetect   # get setting from hwsetup
    459   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    460   source /etc/sysconfig/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    461    
    462   echo   echo
    463   echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}   echo -e ${COLMAGENTA}"Updating detected settings in database"${COLDEFAULT}
    # Line 547  import_settings_local() Line 547  import_settings_local()
    547   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain   [ -z "${ALX_DEFAULT_DOMAIN}" ] && ALX_DEFAULT_DOMAIN=localdomain
    548   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx   [ -z "${ALX_DEFAULT_HOSTNAME}" ] && ALX_DEFAULT_HOSTNAME=magellan-alx
    549    
    550   # vars used by hwdetect   # vars used by hwsetup
    551   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    552   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    553   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE   local MOUSETYPE XMOUSETYPE FULLNAME DEVICE
    554    
    555   # get setting from hwdetect   # get setting from hwsetup
    556   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    557    
    558   echo   echo
    559   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}   echo -e ${COLMAGENTA}"Importing detected settings to local system"${COLDEFAULT}
    # Line 667  import_settings_local() Line 667  import_settings_local()
    667  preliminary_network()  preliminary_network()
    668  {  {
    669   local module   local module
      local modulesconf  
    670    
    671   if [ -f /etc/alxconfig-ng/state/configured ]   if [ -f /etc/alxconfig-ng/state/configured ]
    672   then   then
    # Line 679  preliminary_network() Line 678  preliminary_network()
    678   modprobe ${module}   modprobe ${module}
    679   fi   fi
    680    
      # check modprobe.conf  
      if [[ $(kernel_major_version) = 2.4 ]]  
      then  
      modulesconf="/etc/modules.conf"  
      else  
      modulesconf="/etc/modprobe.conf"  
      fi  
      if [[ -z $(grep eth0 ${modulesconf}) ]]  
      then  
      modules-update force  
      fi  
    681   else   else
    682   # vars used by hwdetect   # vars used by hwsetup
    683   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    684   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    685    
    686   # get setting from hwdetect   # get setting from hwsetup
    687   source /etc/sysconfig/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    688   modprobe ${NETCARD_DRIVER}   modprobe ${NETCARD_DRIVER}
    689   fi   fi
    690    
    # Line 705  preliminary_network() Line 693  preliminary_network()
    693   # keeping like always safe:   # keeping like always safe:
    694   # no network should be startet here,   # no network should be startet here,
    695   # so we can delete all pid files if one exists   # so we can delete all pid files if one exists
    696   if ps -A|grep dhcpcd > /dev/null   if ps -A|grep udhcpc > /dev/null
    697   then   then
    698   echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}   echo -e ${COLMAGENTA}"Forcing network down"${COLDEFAULT}
    699   dhcpcd -k   killall udhcpc &> /dev/null
    700   sleep 1   sleep 1
      else  
      rm -f /var/run/dhcpcd-eth?.pid  
    701   fi   fi
    702   [[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \   [[ ${ALX_CONFD_NETWORKING} = true ]] && [[ ${RUNLEVEL} != S ]] && \
    703   ${rc_base}/init.d/network stop   ${rc_base}/init.d/network stop
    # Line 725  preliminary_network() Line 711  preliminary_network()
    711   else   else
    712   echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}   echo -e ${COLOREDSTAR}"Starting default dhcp based networking ... "${COLDEFAULT}
    713   # -t 10 timeout of 10 secs   # -t 10 timeout of 10 secs
    714   dhcpcd -t 10 &> /dev/null   udhcpc -t 10 &> /dev/null
    715   evaluate_retval   evaluate_retval
    716   fi   fi
    717   ;;   ;;
    # Line 739  preliminary_network() Line 725  preliminary_network()
    725   echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}   echo -e ${COLOREDSTAR}"Stopping default dhcp based networking ... "${COLDEFAULT}
    726   ifconfig eth0 down   ifconfig eth0 down
    727   fi   fi
    728   if ps -A|grep dhcpcd > /dev/null   if ps -A|grep udhcpc > /dev/null
    729   then   then
    730   dhcpcd -z  &> /dev/null   killall udhcpc  &> /dev/null
    731   sleep 1   sleep 1
    732   fi   fi
    733   evaluate_retval   evaluate_retval
    Legend:
    Removed from v.2007  
    changed lines
      Added in v.2014