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 3202 by niro, Wed Sep 14 13:12:00 2011 UTC revision 4847 by niro, Mon May 13 12:11:18 2013 UTC
    # Line 206  dialog_hardware_detection() Line 206  dialog_hardware_detection()
    206   # other devices   # other devices
    207   run_hardware_detection   run_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 --gfxcard)"
    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 458  run_hardware_detection() Line 459  run_hardware_detection()
    459    
    460   # only add this for grub legacy, grub2 detect these settings on its own   # only add this for grub legacy, grub2 detect these settings on its own
    461   export GRUBLEGACYOPTS="rootdelay=8"   export GRUBLEGACYOPTS="rootdelay=8"
    462   export SPECIALDEVICE="zotac"   # there are to zotac types in the wild, nvidia based gfx and intel
    463     if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    464     then
    465     export SPECIALDEVICE="zotac_nvidia"
    466     else
    467     export SPECIALDEVICE="zotac_intel"
    468     fi
    469   fi   fi
    470    
    471   # check for special devices/clients:   # check for special devices/clients:
    # Line 470  run_hardware_detection() Line 477  run_hardware_detection()
    477   export SPECIALDEVICE="rangee"   export SPECIALDEVICE="rangee"
    478   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
    479   fi   fi
    480    
    481     # check for special devices/clients:
    482     # check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
    483     if [[ ! -z $(echo "${hwinfo}" | grep -i i810) ]] || [[ ! -z $(echo "${hwinfo}" | grep -i i815) ]]
    484     then
    485     export SPECIALDEVICE="maxdata"
    486     export GRUBLEGACYOPTS=""
    487     fi
    488  }  }
    489    
    490  hdd_size_below_256mb()  hdd_size_below_256mb()
    # Line 733  install_initrd_chroot() Line 748  install_initrd_chroot()
    748   SATAMODS="sata_via sata_sis sata_nv"   SATAMODS="sata_via sata_sis sata_nv"
    749   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
    750   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
    751   zotac) FBMODS="" ;;   zotac_intel) FBMODS=""; DRMMODS="i915" ;;
    752   rangee) FBMODS="viafb" ;;   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
    753     rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
    754     maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
    755   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
    756   esac   esac
    757    
    # Line 745  install_initrd_chroot() Line 762  install_initrd_chroot()
    762   # install an appropriate viafb.conf   # install an appropriate viafb.conf
    763   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
    764    
    765     # install an appropriate i810fb.conf
    766     echo "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"  > ${INSTALLPATH}/etc/modprobe.d/i810fb.conf || die
    767    
    768   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
    769  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
    770  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
    # Line 813  install_system_settings() Line 833  install_system_settings()
    833    
    834   # install network config skeleton   # install network config skeleton
    835   install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die   install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
    836    
    837     # intel framebufer quirk
    838     if [[ -e /proc/fb ]]
    839     then
    840     if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
    841     then
    842     fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
    843     if [[ ${fbdev} != 0 ]]
    844     then
    845     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
    846     fi
    847     fi
    848     fi
    849  }  }
    850    
    851  install_system_settings_flash()  install_system_settings_flash()
    Legend:
    Removed from v.3202  
    changed lines
      Added in v.4847