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 5002 by niro, Wed May 15 07:25:12 2013 UTC revision 5003 by niro, Wed Aug 7 10:42:07 2013 UTC
    # Line 43  FDISKPARTIONBELOW256MB=0 Line 43  FDISKPARTIONBELOW256MB=0
    43    
    44  # default specialdevices  # default specialdevices
    45  SPECIALDEVICE=""  SPECIALDEVICE=""
    46    FORMFACTOR="desktop"
    47    
    48  # target filesystem  # target filesystem
    49  FORMAT_FILESYSTEM="ext4"  FORMAT_FILESYSTEM="ext4"
    # Line 211  dialog_hardware_detection() Line 212  dialog_hardware_detection()
    212   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    213   *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;   *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
    214   esac   esac
    215     if [[ ${FORMFACTOR} = laptop ]]
    216     then
    217     echo " \n\n\n \\ZnFormfactor Laptop erkannt, Powersave Modus 'ondemand' wird aktiviert!\\Zn \\" >> ${hwtmp} ;;
    218     fi
    219    
    220   echo " \" 13 70" >> ${hwtmp}   echo " \" 13 70" >> ${hwtmp}
    221   chmod a+x ${hwtmp}   chmod a+x ${hwtmp}
    # Line 442  run_hardware_detection() Line 447  run_hardware_detection()
    447  {  {
    448   local hwinfo   local hwinfo
    449    
    450   hwinfo="$(hwinfo --bios --storage --pci --gfxcard)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
    451    
    452   # check for special devices/clients:   # check for special devices/clients:
    453   # 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 485  run_hardware_detection() Line 490  run_hardware_detection()
    490   export SPECIALDEVICE="maxdata"   export SPECIALDEVICE="maxdata"
    491   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
    492   fi   fi
    493    
    494     # check for special devices/clients:
    495     # check for laptops and activate cpufreq scaling
    496     if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
    497     then
    498     export FORMFACTOR="laptop"
    499     export KERNELOPTS="${KERNELOPTS} cpufreq.governor=ondemand"
    500     fi
    501  }  }
    502    
    503  hdd_size_below_256mb()  hdd_size_below_256mb()
    # Line 747  install_initrd_chroot() Line 760  install_initrd_chroot()
    760   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
    761   SATAMODS="sata_via sata_sis sata_nv"   SATAMODS="sata_via sata_sis sata_nv"
    762   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
    763     OTHERMODS=""
    764   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
    765   zotac_intel) FBMODS=""; DRMMODS="i915" ;;   zotac_intel) FBMODS=""; DRMMODS="i915" ;;
    766   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
    # Line 757  install_initrd_chroot() Line 771  install_initrd_chroot()
    771   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
    772   esac   esac
    773    
    774     if [[ ${FORMFACTOR} = laptop ]]
    775     then
    776     OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
    777     fi
    778    
    779   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
    780   install -d ${INSTALLPATH}/etc/modprobe.d || die   install -d ${INSTALLPATH}/etc/modprobe.d || die
    781   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
    # Line 768  install_initrd_chroot() Line 787  install_initrd_chroot()
    787   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   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
    788    
    789   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
    790  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd
    791  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
    792  exit 0  exit 0
    793  CHROOTEOF  CHROOTEOF
    Legend:
    Removed from v.5002  
    changed lines
      Added in v.5003