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 2008 by niro, Mon May 9 15:35:49 2011 UTC revision 2009 by niro, Mon May 9 15:41:55 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/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    287   source /etc/conf.d/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    288    
    # 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/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    460   source /etc/conf.d/hwsetup/mouse   source /etc/conf.d/hwsetup/mouse
    461    
    # 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/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    557    
    558   echo   echo
    # Line 691  preliminary_network() Line 691  preliminary_network()
    691   modules-update force   modules-update force
    692   fi   fi
    693   else   else
    694   # vars used by hwdetect   # vars used by hwsetup
    695   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME   local NETCARD_FULLNAME NETCARD_DRIVER MOUSE_FULLNAME MOUSE_DEVICE SOUND_FULLNAME
    696   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER   local SOUND_DRIVER XSERVER XMODULE XDESC FLOPPY_FULLNAME FLOPPY_DEVICE FLOPPY_DRIVER
    697    
    698   # get setting from hwdetect   # get setting from hwsetup
    699   source /etc/conf.d/hwsetup/knoppix   source /etc/conf.d/hwsetup/knoppix
    700   modprobe ${NETCARD_DRIVER}   modprobe ${NETCARD_DRIVER}
    701   fi   fi
    Legend:
    Removed from v.2008  
    changed lines
      Added in v.2009