Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

    revision 3259 by niro, Thu Sep 22 09:09:21 2011 UTC revision 3260 by niro, Wed Sep 28 14:54:49 2011 UTC
    # Line 208  dialog_hardware_detection() Line 208  dialog_hardware_detection()
    208   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
    209   zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;   zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    210   rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;   rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    211     maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    212   *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;   *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    213   esac   esac
    214    
    # Line 441  run_hardware_detection() Line 442  run_hardware_detection()
    442  {  {
    443   local hwinfo   local hwinfo
    444    
    445   hwinfo="$(hwinfo --bios --storage)"   hwinfo="$(hwinfo --bios --storage --pci)"
    446    
    447   # check for special devices/clients:   # check for special devices/clients:
    448   # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd   # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
    # Line 470  run_hardware_detection() Line 471  run_hardware_detection()
    471   export SPECIALDEVICE="rangee"   export SPECIALDEVICE="rangee"
    472   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
    473   fi   fi
    474    
    475     # check for special devices/clients:
    476     # check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
    477     if [[ ! -z $(echo "${hwinfo}" | grep -i i810) ]] || [[ ! -z $(echo "${hwinfo}" | grep -i i815) ]]
    478     then
    479     export SPECIALDEVICE="maxdata"
    480     export GRUBLEGACYOPTS=""
    481     fi
    482  }  }
    483    
    484  hdd_size_below_256mb()  hdd_size_below_256mb()
    # Line 735  install_initrd_chroot() Line 744  install_initrd_chroot()
    744   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
    745   zotac) FBMODS="" ;;   zotac) FBMODS="" ;;
    746   rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards   rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
    747     maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
    748   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
    749   esac   esac
    750    
    # Line 745  install_initrd_chroot() Line 755  install_initrd_chroot()
    755   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    756   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die
    757    
    758     # install an appropriate i810fb.conf
    759     echo "echo i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die
    760    
    761   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
    762  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
    763  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
    Legend:
    Removed from v.3259  
    changed lines
      Added in v.3260