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 5006 by niro, Wed Aug 7 11:10:32 2013 UTC revision 6799 by niro, Wed Jul 22 11:08:40 2015 UTC
    # Line 37  KERNELOPTS="quiet video=1024x768" Line 37  KERNELOPTS="quiet video=1024x768"
    37  # grub options  # grub options
    38  GRUBLEGACYOPTS=""  GRUBLEGACYOPTS=""
    39  GRUB2OPTS=""  GRUB2OPTS=""
    40    GRUB2GFXPAYLOAD="1024x768x16,1024x768"
    41    
    42  # fdisk options  # fdisk options
    43  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
    # Line 94  dialog_setup_hdd_info() Line 95  dialog_setup_hdd_info()
    95   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    96  }  }
    97    
    98  dialog_setup_hdd_info_flash()  dialog_setup_hdd_info_simple()
    99  {  {
    100   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    101    
    # Line 144  dialog_setup_system_menu() Line 145  dialog_setup_system_menu()
    145   then   then
    146   case "${i}" in   case "${i}" in
    147   "1") run_install_auto ;;   "1") run_install_auto ;;
    148           "2") run_install_normal ;;   "2") run_install_normal ;;
    149   "3") run_install_flash ;;   "3") run_install_simple ;;
    150   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    151   esac   esac
    152   fi   fi
    # Line 210  dialog_hardware_detection() Line 211  dialog_hardware_detection()
    211   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    212   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    213   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    214     i845) echo " \n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    215   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
    216   esac   esac
    217   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    # Line 266  dialog_setup_hdd_partitions_manuell() Line 268  dialog_setup_hdd_partitions_manuell()
    268   fi   fi
    269  }  }
    270    
    271  dialog_setup_hdd_partitions_manuell_flash()  dialog_setup_hdd_partitions_manuell_simple()
    272  {  {
    273   local i   local i
    274    
    # Line 298  dialog_setup_hdd_partitions_manuell_flas Line 300  dialog_setup_hdd_partitions_manuell_flas
    300   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    301   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    302   then   then
    303   dialog_setup_hdd_info_flash   dialog_setup_hdd_info_simple
    304   setup_hdd_partitions_manuell_flash   setup_hdd_partitions_manuell_simple
    305   fi   fi
    306   fi   fi
    307  }  }
    # Line 431  dialog_main() Line 433  dialog_main()
    433   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    434   then   then
    435   case ${METHOD} in   case ${METHOD} in
    436           "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
    437   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
    438   "3") install_do_reboot ;;   "3") install_do_reboot ;;
    439   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
    # Line 464  run_hardware_detection() Line 466  run_hardware_detection()
    466    
    467   # 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
    468   export GRUBLEGACYOPTS="rootdelay=8"   export GRUBLEGACYOPTS="rootdelay=8"
    469   # there are to zotac types in the wild, nvidia based gfx and intel   # there are two zotac types in the wild, nvidia based gfx and intel
    470   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
    471   then   then
    472   export SPECIALDEVICE="zotac_nvidia"   export SPECIALDEVICE="zotac_nvidia"
    # Line 491  run_hardware_detection() Line 493  run_hardware_detection()
    493   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
    494   fi   fi
    495    
    496     # check for i845 Chipsets and disable KMS and use 915 drm driver
    497     if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
    498     then
    499     export SPECIALDEVICE="i845"
    500     # unset default video=1024x768 opt or the drm driver breaks
    501     export KERNELOPTS="quiet"
    502     export GRUBLEGACYOPTS=""
    503     # enable full kms support
    504     export GRUB2GFXPAYLOAD="keep"
    505     fi
    506    
    507     # check for radeon gfxcards
    508     if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
    509     then
    510     # enable full kms support
    511     export GRUB2GFXPAYLOAD="keep"
    512     fi
    513    
    514   # check for special devices/clients:   # check for special devices/clients:
    515   # check for laptops and activate cpufreq scaling   # check for laptops and activate cpufreq scaling
    516   if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]   if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
    # Line 590  setup_hdd_partitions_manuell() Line 610  setup_hdd_partitions_manuell()
    610   cfdisk ${HDD} || die   cfdisk ${HDD} || die
    611  }  }
    612    
    613  setup_hdd_partitions_manuell_flash()  setup_hdd_partitions_manuell_simple()
    614  {  {
    615   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    616    
    # Line 605  setup_hdd_format() Line 625  setup_hdd_format()
    625   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    626  }  }
    627    
    628  setup_hdd_format_flash()  setup_hdd_format_simple()
    629  {  {
    630   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    631  }  }
    # Line 619  install_mount_rootfs() Line 639  install_mount_rootfs()
    639   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || die
    640  }  }
    641    
    642  install_mount_rootfs_flash()  install_mount_rootfs_simple()
    643  {  {
    644   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALLPATH} || die
    645   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALLPATH}/boot || die
    # Line 650  install_bootsector_chroot() Line 670  install_bootsector_chroot()
    670   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
    671   then   then
    672   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
    673     sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die
    674   else   else
    675   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
    676     echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die
    677   fi   fi
    678   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
    679   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
    # Line 762  install_initrd_chroot() Line 784  install_initrd_chroot()
    784   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
    785   OTHERMODS=""   OTHERMODS=""
    786   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
    787   zotac_intel) FBMODS=""; DRMMODS="i915" ;;   zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;;
    788   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
    789   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
    790   # not working with kms enabled drivers -> segfaults   # not working with kms enabled drivers -> segfaults
    # Line 869  install_system_settings() Line 891  install_system_settings()
    891   fi   fi
    892  }  }
    893    
    894  install_system_settings_flash()  install_system_settings_simple()
    895  {  {
    896   # schreibe fstab   # schreibe fstab
    897   if is_uuid_supported   if is_uuid_supported
    # Line 890  install_umount_rootfs() Line 912  install_umount_rootfs()
    912   swapoff ${SWAPHDD} || die   swapoff ${SWAPHDD} || die
    913  }  }
    914    
    915  install_umount_rootfs_flash()  install_umount_rootfs_simple()
    916  {  {
    917   cd /   cd /
    918   umount ${INSTALLPATH} || die   umount ${INSTALLPATH} || die
    # Line 927  run_install_normal() Line 949  run_install_normal()
    949   dialog_install_successful   dialog_install_successful
    950  }  }
    951    
    952  run_install_flash()  run_install_simple()
    953  {  {
    954   dialog_hardware_detection   dialog_hardware_detection
    955    
    956   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_simple
    957   dialog_setup_hdd_format   dialog_setup_hdd_format
    958   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
    959   install_mount_rootfs_flash   install_mount_rootfs_simple
    960   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
    961    
    962   dialog_install_settings   dialog_install_settings
    963   sleep 1   sleep 1
    964   install_system_settings_flash   install_system_settings_simple
    965   install_initrd_chroot   install_initrd_chroot
    966    
    967   dialog_install_bootsector   dialog_install_bootsector
    968   install_bootsector_chroot   install_bootsector_chroot
    969    
    970   install_umount_rootfs_flash   install_umount_rootfs_simple
    971   dialog_install_successful   dialog_install_successful
    972  }  }
    973    
    # Line 955  run_install_auto() Line 977  run_install_auto()
    977    
    978   dialog_setup_hdd_partitions_auto   dialog_setup_hdd_partitions_auto
    979   dialog_setup_hdd_format   dialog_setup_hdd_format
    980   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
    981   install_mount_rootfs_flash   install_mount_rootfs_simple
    982   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
    983    
    984   dialog_install_settings   dialog_install_settings
    985   sleep 1   sleep 1
    986   install_system_settings_flash   install_system_settings_simple
    987   install_initrd_chroot   install_initrd_chroot
    988    
    989   dialog_install_bootsector   dialog_install_bootsector
    990   install_bootsector_chroot   install_bootsector_chroot
    991    
    992   install_umount_rootfs_flash   install_umount_rootfs_simple
    993   dialog_install_successful   dialog_install_successful
    994  }  }
    995    
    Legend:
    Removed from v.5006  
    changed lines
      Added in v.6799