Magellan Linux

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

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

revision 4847 by niro, Mon May 13 12:11:18 2013 UTC revision 6815 by niro, Thu Jul 23 08:26:38 2015 UTC
# Line 11  Line 11 
11  # Install Navigation Gui  # Install Navigation Gui
12  #  #
13    
14    # ignore environment!
15    LC_ALL=C
16    
17  #images: (get ${CDIMAGENAME})  #images: (get ${CDIMAGENAME})
18  source /mnt/cdrom/system/images.conf  source /mnt/cdrom/system/images.conf
19    
# Line 37  KERNELOPTS="quiet video=1024x768" Line 40  KERNELOPTS="quiet video=1024x768"
40  # grub options  # grub options
41  GRUBLEGACYOPTS=""  GRUBLEGACYOPTS=""
42  GRUB2OPTS=""  GRUB2OPTS=""
43    GRUB2GFXPAYLOAD="1024x768x16,1024x768"
44    
45  # fdisk options  # fdisk options
46  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
47    
48  # default specialdevices  # default specialdevices
49  SPECIALDEVICE=""  SPECIALDEVICE=""
50    FORMFACTOR="desktop"
51    
52  # target filesystem  # target filesystem
53  FORMAT_FILESYSTEM="ext4"  FORMAT_FILESYSTEM="ext4"
# Line 93  dialog_setup_hdd_info() Line 98  dialog_setup_hdd_info()
98   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
99  }  }
100    
101  dialog_setup_hdd_info_flash()  dialog_setup_hdd_info_simple()
102  {  {
103   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
104    
# Line 143  dialog_setup_system_menu() Line 148  dialog_setup_system_menu()
148   then   then
149   case "${i}" in   case "${i}" in
150   "1") run_install_auto ;;   "1") run_install_auto ;;
151           "2") run_install_normal ;;   "2") run_install_normal ;;
152   "3") run_install_flash ;;   "3") run_install_simple ;;
153   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
154   esac   esac
155   fi   fi
# Line 206  dialog_hardware_detection() Line 211  dialog_hardware_detection()
211   # other devices   # other devices
212   run_hardware_detection   run_hardware_detection
213   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
214   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
215   rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
216   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt!\\Zn \\" >> ${hwtmp} ;;   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
217   *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;   i845) echo " \n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
218     *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
219   esac   esac
220     if [[ ${FORMFACTOR} = laptop ]]
221     then
222     echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
223     fi
224    
225   echo " \" 13 70" >> ${hwtmp}   echo " \" 14 70" >> ${hwtmp}
226   chmod a+x ${hwtmp}   chmod a+x ${hwtmp}
227   ${hwtmp}   ${hwtmp}
228    
# Line 261  dialog_setup_hdd_partitions_manuell() Line 271  dialog_setup_hdd_partitions_manuell()
271   fi   fi
272  }  }
273    
274  dialog_setup_hdd_partitions_manuell_flash()  dialog_setup_hdd_partitions_manuell_simple()
275  {  {
276   local i   local i
277    
# Line 293  dialog_setup_hdd_partitions_manuell_flas Line 303  dialog_setup_hdd_partitions_manuell_flas
303   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
304   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
305   then   then
306   dialog_setup_hdd_info_flash   dialog_setup_hdd_info_simple
307   setup_hdd_partitions_manuell_flash   setup_hdd_partitions_manuell_simple
308   fi   fi
309   fi   fi
310  }  }
# Line 426  dialog_main() Line 436  dialog_main()
436   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
437   then   then
438   case ${METHOD} in   case ${METHOD} in
439           "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
440   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
441   "3") install_do_reboot ;;   "3") install_do_reboot ;;
442   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
# Line 442  run_hardware_detection() Line 452  run_hardware_detection()
452  {  {
453   local hwinfo   local hwinfo
454    
455   hwinfo="$(hwinfo --bios --storage --pci --gfxcard)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
456    
457   # check for special devices/clients:   # check for special devices/clients:
458   # 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 459  run_hardware_detection() Line 469  run_hardware_detection()
469    
470   # 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
471   export GRUBLEGACYOPTS="rootdelay=8"   export GRUBLEGACYOPTS="rootdelay=8"
472   # 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
473   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]   if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
474   then   then
475   export SPECIALDEVICE="zotac_nvidia"   export SPECIALDEVICE="zotac_nvidia"
# Line 485  run_hardware_detection() Line 495  run_hardware_detection()
495   export SPECIALDEVICE="maxdata"   export SPECIALDEVICE="maxdata"
496   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
497   fi   fi
498    
499     # check for i845 Chipsets and disable KMS and use 915 drm driver
500     if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
501     then
502     export SPECIALDEVICE="i845"
503     # unset default video=1024x768 opt or the drm driver breaks
504     export KERNELOPTS="quiet"
505     export GRUBLEGACYOPTS=""
506     # enable full kms support
507     export GRUB2GFXPAYLOAD="keep"
508     fi
509    
510     # check for radeon gfxcards
511     if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
512     then
513     # enable full kms support
514     export GRUB2GFXPAYLOAD="keep"
515     fi
516    
517     # check for special devices/clients:
518     # check for laptops and activate cpufreq scaling
519     if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
520     then
521     export FORMFACTOR="laptop"
522     export KERNELOPTS="${KERNELOPTS} cpufreq.governor=ondemand"
523     fi
524  }  }
525    
526  hdd_size_below_256mb()  hdd_size_below_256mb()
# Line 577  setup_hdd_partitions_manuell() Line 613  setup_hdd_partitions_manuell()
613   cfdisk ${HDD} || die   cfdisk ${HDD} || die
614  }  }
615    
616  setup_hdd_partitions_manuell_flash()  setup_hdd_partitions_manuell_simple()
617  {  {
618   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
619    
# Line 592  setup_hdd_format() Line 628  setup_hdd_format()
628   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
629  }  }
630    
631  setup_hdd_format_flash()  setup_hdd_format_simple()
632  {  {
633   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
634  }  }
# Line 606  install_mount_rootfs() Line 642  install_mount_rootfs()
642   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || die
643  }  }
644    
645  install_mount_rootfs_flash()  install_mount_rootfs_simple()
646  {  {
647   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALLPATH} || die
648   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALLPATH}/boot || die
# Line 637  install_bootsector_chroot() Line 673  install_bootsector_chroot()
673   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
674   then   then
675   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
676     sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die
677   else   else
678   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
679     echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die
680   fi   fi
681   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
682   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 747  install_initrd_chroot() Line 785  install_initrd_chroot()
785   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"
786   SATAMODS="sata_via sata_sis sata_nv"   SATAMODS="sata_via sata_sis sata_nv"
787   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
788     OTHERMODS=""
789   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
790   zotac_intel) FBMODS=""; DRMMODS="i915" ;;   zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;;
791   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
792   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
793   maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer   # not working with kms enabled drivers -> segfaults
794     #maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
795     maxdata) FBMODS="" ;;
796   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
797   esac   esac
798    
799     if [[ ${FORMFACTOR} = laptop ]]
800     then
801     OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
802     fi
803    
804   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
805   install -d ${INSTALLPATH}/etc/modprobe.d || die   install -d ${INSTALLPATH}/etc/modprobe.d || die
806   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 766  install_initrd_chroot() Line 812  install_initrd_chroot()
812   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
813    
814   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
815  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
816  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
817  exit 0  exit 0
818  CHROOTEOF  CHROOTEOF
# Line 848  install_system_settings() Line 894  install_system_settings()
894   fi   fi
895  }  }
896    
897  install_system_settings_flash()  install_system_settings_simple()
898  {  {
899   # schreibe fstab   # schreibe fstab
900   if is_uuid_supported   if is_uuid_supported
# Line 869  install_umount_rootfs() Line 915  install_umount_rootfs()
915   swapoff ${SWAPHDD} || die   swapoff ${SWAPHDD} || die
916  }  }
917    
918  install_umount_rootfs_flash()  install_umount_rootfs_simple()
919  {  {
920   cd /   cd /
921   umount ${INSTALLPATH} || die   umount ${INSTALLPATH} || die
# Line 906  run_install_normal() Line 952  run_install_normal()
952   dialog_install_successful   dialog_install_successful
953  }  }
954    
955  run_install_flash()  run_install_simple()
956  {  {
957   dialog_hardware_detection   dialog_hardware_detection
958    
959   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_simple
960   dialog_setup_hdd_format   dialog_setup_hdd_format
961   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
962   install_mount_rootfs_flash   install_mount_rootfs_simple
963   (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
964    
965   dialog_install_settings   dialog_install_settings
966   sleep 1   sleep 1
967   install_system_settings_flash   install_system_settings_simple
968   install_initrd_chroot   install_initrd_chroot
969    
970   dialog_install_bootsector   dialog_install_bootsector
971   install_bootsector_chroot   install_bootsector_chroot
972    
973   install_umount_rootfs_flash   install_umount_rootfs_simple
974   dialog_install_successful   dialog_install_successful
975  }  }
976    
# Line 934  run_install_auto() Line 980  run_install_auto()
980    
981   dialog_setup_hdd_partitions_auto   dialog_setup_hdd_partitions_auto
982   dialog_setup_hdd_format   dialog_setup_hdd_format
983   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
984   install_mount_rootfs_flash   install_mount_rootfs_simple
985   (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
986    
987   dialog_install_settings   dialog_install_settings
988   sleep 1   sleep 1
989   install_system_settings_flash   install_system_settings_simple
990   install_initrd_chroot   install_initrd_chroot
991    
992   dialog_install_bootsector   dialog_install_bootsector
993   install_bootsector_chroot   install_bootsector_chroot
994    
995   install_umount_rootfs_flash   install_umount_rootfs_simple
996   dialog_install_successful   dialog_install_successful
997  }  }
998    

Legend:
Removed from v.4847  
changed lines
  Added in v.6815