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 3202 by niro, Wed Sep 14 13:12:00 2011 UTC revision 6825 by niro, Thu Jul 23 10:50:11 2015 UTC
# Line 1  Line 1 
1  #!/bin/sh  #!/bin/sh
2  #  # $Id$
 # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $  
 #  
 # AutoSta_LX Installation Script  
 #  
 # Niels Rogalla <niro@magellan-linux.de>  
 # <rogalla@augusta-bochum.de>  
 #  
 #  
 # Install Navigation Gui  
 #  
3    
4  #images: (get ${CDIMAGENAME})  # ignore environment!
5    LC_ALL=C
6    
7    MLIBDIR="/usr/lib/alxinstall-ng"
8    
9    # images: (get ${CDIMAGENAME})
10  source /mnt/cdrom/system/images.conf  source /mnt/cdrom/system/images.conf
11    
12  #Includes  # includes
13  source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null  source ${MLIBDIR}/functions/hwdetection.sh
 ### bugfix ###############################  
 cdromdev="$(echo ${cdromdev} | sed 's/ //')"  
 ########################################  
14    
15  ### System/Config Version  ### System/Config Version
16  VERSION="%VERSIONTAG%"  VERSION="@@VERSION@@"
17  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
18    
19    # locations
20  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
21  INSTALLPATH="/mnt/magellan"  INSTALLPATH="/mnt/magellan"
22    
23  ### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1  # default system settings
 CURRENTLINE=0  
 #TOTALLINES=11072 # -> now in images.conf  
   
24  # standard kernel opts  # standard kernel opts
25  KERNELOPTS="quiet video=1024x768"  DEFAULT_KERNELOPTS="quiet video=1024x768"
26    
27  # grub options  # grub options
28  GRUBLEGACYOPTS=""  DEFAULT_GRUBLEGACYOPTS=""
29  GRUB2OPTS=""  DEFAULT_GRUB2OPTS=""
30    DEFAULT_GRUB2GFXPAYLOAD="1024x768x16,1024x768"
 # fdisk options  
 FDISKPARTIONBELOW256MB=0  
31    
32  # default specialdevices  # default specialdevices
33  SPECIALDEVICE=""  DEFAULT_FORMFACTOR="desktop"
34    
35  # target filesystem  # target filesystem
36  FORMAT_FILESYSTEM="ext4"  DEFAULT_FORMAT_FILESYSTEM="ext4"
37    
38    # initialize global variables so they are exportable
39    INSTALL_METHOD=""
40    KERNELOPTS=""
41    GRUBLEGACYOPTS=""
42    GRUB2OPTS=""
43    GRUB2GFXPAYLOAD=""
44    FORMFACTOR=""
45    FORMAT_FILESYSTEM=""
46    FDISKPARTIONBELOW256MB=0
47    SPECIALDEVICE=""
48    ### linecount of system.tar.gz -1 !
49    CURRENTLINE=0
50    #TOTALLINES=11072 # -> now in images.conf
51    
52  #################################################  #################################################
53  #  DIALOG BOXEN #  #  DIALOG BOXES #
54  #################################################  #################################################
55    
56  die()  die()
# Line 93  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_single()
99  {  {
100   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
101    
# Line 136  dialog_setup_system_menu() Line 138  dialog_setup_system_menu()
138   "" "" \   "" "" \
139   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
140   "2" "Normale IDE-Disk (Manuell)" \   "2" "Normale IDE-Disk (Manuell)" \
141   "3" "Flash-Speicher (Manuell)")   "3" "Normale IDE Disk (Single)")
142   RES=$?   RES=$?
143   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
144   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
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 single ;;
150   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
151   esac   esac
152   fi   fi
# Line 162  dialog_hardware_detection() Line 164  dialog_hardware_detection()
164   hwtmp="/tmp/hwtmp.sh"   hwtmp="/tmp/hwtmp.sh"
165   fi   fi
166    
167   [[ ! -z ${installdevs} ]] && installdevs=""   run_hardware_detection_disks
168    
169   echo "dialog \\"  > ${hwtmp}   echo "dialog \\"  > ${hwtmp}
170   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
# Line 172  dialog_hardware_detection() Line 174  dialog_hardware_detection()
174   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
175   echo " Festplatten:\n \\" >> ${hwtmp}   echo " Festplatten:\n \\" >> ${hwtmp}
176    
177   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${ALL_DISKS} ]]
178   then   then
179   for i in ${scsidisks}   for i in ${ALL_DISKS}
180   do   do
181   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
  then  
  echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
  installdevs="${installdevs} ${i}"  
  fi  
182   done   done
183   fi   fi
184    
185   if [[ ! -z ${idedisks} ]]   if [[ ! -z ${ALL_CDROMS} ]]
186   then   then
187   for i in ${idedisks}   echo " \n \\" >> ${hwtmp}
188     echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
189     for i in ${ALL_CDROMS}
190   do   do
191   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
  then  
  echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
  installdevs="${installdevs} ${i}"  
  fi  
192   done   done
193   fi   fi
194    
  if [[ ! -z ${cdromdev} ]]  
  then  
  echo " \n \\" >> ${hwtmp}  
  echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}  
  echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}  
  fi  
   
195   # other devices   # other devices
196   run_hardware_detection   run_hardware_detection
197   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
198   zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;   zotac*) echo " \n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
199   rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;   rangee) echo " \n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
200   *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;   maxdata) echo " \n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
201     i845) echo " \n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
202     *) echo " \n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
203   esac   esac
204     if [[ ${FORMFACTOR} = laptop ]]
205     then
206     echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
207     fi
208    
209   echo " \" 13 70" >> ${hwtmp}   echo " \" 14 70" >> ${hwtmp}
210   chmod a+x ${hwtmp}   chmod a+x ${hwtmp}
211   ${hwtmp}   ${hwtmp}
212    
# Line 226  dialog_setup_hdd_partitions_manuell() Line 221  dialog_setup_hdd_partitions_manuell()
221  {  {
222   local i   local i
223    
224   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
225   then   then
226   dialog \   dialog \
227   --backtitle "${TITLE}" \   --backtitle "${TITLE}" \
# Line 242  dialog_setup_hdd_partitions_manuell() Line 237  dialog_setup_hdd_partitions_manuell()
237   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> /tmp/hddtmp.sh
238   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
239    
240   for i in ${installdevs}   for i in ${ALL_DISKS}
241   do   do
242   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
243   done   done
# Line 260  dialog_setup_hdd_partitions_manuell() Line 255  dialog_setup_hdd_partitions_manuell()
255   fi   fi
256  }  }
257    
258  dialog_setup_hdd_partitions_manuell_flash()  dialog_setup_hdd_partitions_manuell_single()
259  {  {
260   local i   local i
261    
262   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
263   then   then
264   dialog \   dialog \
265   --backtitle "${TITLE}" \   --backtitle "${TITLE}" \
# Line 280  dialog_setup_hdd_partitions_manuell_flas Line 275  dialog_setup_hdd_partitions_manuell_flas
275   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> /tmp/hddtmp.sh
276   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
277    
278   for i in ${installdevs}   for i in ${ALL_DISKS}
279   do   do
280   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
281   done   done
# Line 292  dialog_setup_hdd_partitions_manuell_flas Line 287  dialog_setup_hdd_partitions_manuell_flas
287   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
288   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
289   then   then
290   dialog_setup_hdd_info_flash   dialog_setup_hdd_info_single
291   setup_hdd_partitions_manuell_flash   setup_hdd_partitions_manuell_single
292   fi   fi
293   fi   fi
294  }  }
# Line 302  dialog_setup_hdd_partitions_auto() Line 297  dialog_setup_hdd_partitions_auto()
297  {  {
298   local i   local i
299    
300   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
301   then   then
302   dialog \   dialog \
303   --backtitle "${TITLE}" \   --backtitle "${TITLE}" \
# Line 318  dialog_setup_hdd_partitions_auto() Line 313  dialog_setup_hdd_partitions_auto()
313   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> /tmp/hddtmp.sh
314   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
315    
316   for i in ${installdevs}   for i in ${ALL_DISKS}
317   do   do
318   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
319   done   done
# Line 378  dialog_install_meter() Line 373  dialog_install_meter()
373   return 0   return 0
374  }  }
375    
   
376  dialog_install_bootsector()  dialog_install_bootsector()
377  {  {
378   dialog \   dialog \
# Line 425  dialog_main() Line 419  dialog_main()
419   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
420   then   then
421   case ${METHOD} in   case ${METHOD} in
422           "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
423   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
424   "3") install_do_reboot ;;   "3") install_do_reboot ;;
425   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
# Line 435  dialog_main() Line 429  dialog_main()
429  }  }
430    
431  #################################################  #################################################
432  # Install Komandos #  # Install Commands #
433  #################################################  #################################################
434  run_hardware_detection()  run_hardware_detection()
435  {  {
436   local hwinfo   local hwinfo
437     hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
  hwinfo="$(hwinfo --bios --storage)"  
438    
439   # check for special devices/clients:   # check for special devices/clients:
440   # 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 451  run_hardware_detection()
451    
452   # 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
453   export GRUBLEGACYOPTS="rootdelay=8"   export GRUBLEGACYOPTS="rootdelay=8"
454   export SPECIALDEVICE="zotac"   # there are two zotac types in the wild, nvidia based gfx and intel
455     if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
456     then
457     export SPECIALDEVICE="zotac_nvidia"
458     else
459     export SPECIALDEVICE="zotac_intel"
460     fi
461   fi   fi
462    
463   # check for special devices/clients:   # check for special devices/clients:
# Line 470  run_hardware_detection() Line 469  run_hardware_detection()
469   export SPECIALDEVICE="rangee"   export SPECIALDEVICE="rangee"
470   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
471   fi   fi
472    
473     # check for special devices/clients:
474     # check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
475     if [[ ! -z $(echo "${hwinfo}" | grep -i i810) ]] || [[ ! -z $(echo "${hwinfo}" | grep -i i815) ]]
476     then
477     export SPECIALDEVICE="maxdata"
478     export GRUBLEGACYOPTS=""
479     fi
480    
481     # check for i845 Chipsets and disable KMS and use 915 drm driver
482     if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
483     then
484     export SPECIALDEVICE="i845"
485     # unset default video=1024x768 opt or the drm driver breaks
486     export KERNELOPTS="quiet"
487     export GRUBLEGACYOPTS=""
488     # enable full kms support
489     export GRUB2GFXPAYLOAD="keep"
490     fi
491    
492     # check for radeon gfxcards
493     if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
494     then
495     # enable full kms support
496     export GRUB2GFXPAYLOAD="keep"
497     fi
498    
499     # check for special devices/clients:
500     # check for laptops and activate cpufreq scaling
501     if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
502     then
503     export FORMFACTOR="laptop"
504     export KERNELOPTS="${KERNELOPTS} cpufreq.governor=ondemand"
505     fi
506    }
507    
508    run_hardware_detection_disks()
509    {
510     local bootdev
511    
512     # all disks but exclude ramdisks
513     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
514     # remove the boot device from ALL_DISKS if it was an usbstick
515     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
516     then
517     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
518     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
519     fi
520     export ALL_CDROMS="$(get_hwinfo cdrom)"
521  }  }
522    
523  hdd_size_below_256mb()  hdd_size_below_256mb()
# Line 554  EOF Line 602  EOF
602    
603  setup_hdd_partitions_manuell()  setup_hdd_partitions_manuell()
604  {  {
605   BOOTHDD="${HDD}1"   case "${INSTALL_METHOD}" in
606   SWAPHDD="${HDD}2"   normal)
607   ROOTHDD="${HDD}3"   BOOTHDD="${HDD}1"
608     SWAPHDD="${HDD}2"
609   ## hdds partitionieren manuell   ROOTHDD="${HDD}3"
610   cfdisk ${HDD} || die   ;;
611  }  
612     single|auto)
613  setup_hdd_partitions_manuell_flash()   ROOTHDD="${HDD}1"
614  {   ;;
615   ROOTHDD="${HDD}1"   esac
616    
617   ## hdds partitionieren manuell   ## hdds partitionieren manuell
618   cfdisk ${HDD} || die   cfdisk ${HDD} || die
# Line 572  setup_hdd_partitions_manuell_flash() Line 620  setup_hdd_partitions_manuell_flash()
620    
621  setup_hdd_format()  setup_hdd_format()
622  {  {
623   mkswap ${SWAPHDD} || die   if [[ -n ${SWAPHDD} ]]
624   mke2fs -j -q ${BOOTHDD} || die   then
625   mke2fs -j -q ${ROOTHDD} || die   mkswap ${SWAPHDD} || die
626  }   fi
627     if [[ -n ${BOOTHDD} ]]
628  setup_hdd_format_flash()   then
629  {   mke2fs -j -q ${BOOTHDD} || die
630   mke2fs -j -q ${ROOTHDD} || die   fi
631     if [[ -n ${ROOTHDD} ]]
632     then
633     mke2fs -j -q ${ROOTHDD} || die
634     fi
635  }  }
636    
637  install_mount_rootfs()  install_mount_rootfs()
638  {  {
639   swapon ${SWAPHDD} || die   if [[ -n ${SWAPHDD} ]]
640   mount ${ROOTHDD} ${INSTALLPATH} || die   then
641   install -d ${INSTALLPATH}/boot || die   swapon ${SWAPHDD} || die
642   mount ${BOOTHDD} ${INSTALLPATH}/boot || die   fi
643   cd ${INSTALLPATH} || die   if [[ -n ${ROOTHDD} ]]
644  }   then
645     mount ${ROOTHDD} ${INSTALLPATH} || die
646     fi
647     if [[ -n ${BOOTHDD} ]]
648     then
649     install -d ${INSTALLPATH}/boot || die
650     mount ${BOOTHDD} ${INSTALLPATH}/boot || die
651     fi
652    
 install_mount_rootfs_flash()  
 {  
  mount ${ROOTHDD} ${INSTALLPATH} || die  
  install -d ${INSTALLPATH}/boot || die  
653   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || die
654  }  }
655    
# Line 622  install_bootsector_chroot() Line 677  install_bootsector_chroot()
677   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
678   then   then
679   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
680     sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die
681   else   else
682   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
683     echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die
684   fi   fi
685   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
686   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 693  install_bootsector_chroot() Line 750  install_bootsector_chroot()
750   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
751   fi   fi
752    
753   # bootsector schreiben chrooted schreiben (lfs/magellan)   # write bootsector chrooted (lfs/magellan)
754   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
755  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null
756  root (hd0,0)  root (hd0,0)
# Line 732  install_initrd_chroot() Line 789  install_initrd_chroot()
789   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"
790   SATAMODS="sata_via sata_sis sata_nv"   SATAMODS="sata_via sata_sis sata_nv"
791   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
792     OTHERMODS=""
793   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
794   zotac) FBMODS="" ;;   zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;;
795   rangee) FBMODS="viafb" ;;   zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
796     rangee) FBMODS="" ;; ## fallback to vesafb, viafb does not run on all CLE266 boards
797     # not working with kms enabled drivers -> segfaults
798     #maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
799     maxdata) FBMODS="" ;;
800   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
801   esac   esac
802    
803     if [[ ${FORMFACTOR} = laptop ]]
804     then
805     OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
806     fi
807    
808   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
809   install -d ${INSTALLPATH}/etc/modprobe.d || die   install -d ${INSTALLPATH}/etc/modprobe.d || die
810   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 745  install_initrd_chroot() Line 812  install_initrd_chroot()
812   # install an appropriate viafb.conf   # install an appropriate viafb.conf
813   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
814    
815     # install an appropriate i810fb.conf
816     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
817    
818   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
819  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
820  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
821  exit 0  exit 0
822  CHROOTEOF  CHROOTEOF
# Line 800  install_system_settings() Line 870  install_system_settings()
870   # schreibe fstab   # schreibe fstab
871   if is_uuid_supported   if is_uuid_supported
872   then   then
873   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if [[ -n ${BOOTHDD} ]]
874   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
875     echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
876     fi
877     if [[ -n ${ROOTHDD} ]]
878     then
879     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
880     fi
881   else   else
882   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if [[ -n ${BOOTHDD} ]]
883   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
884     echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
885     fi
886     if [[ -n ${ROOTHDD} ]]
887     then
888     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
889     fi
890   fi   fi
891   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
892   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
# Line 813  install_system_settings() Line 895  install_system_settings()
895    
896   # install network config skeleton   # install network config skeleton
897   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
 }  
898    
899  install_system_settings_flash()   # intel framebufer quirk
900  {   if [[ -e /proc/fb ]]
  # schreibe fstab  
  if is_uuid_supported  
901   then   then
902   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
903   else   then
904   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
905     if [[ ${fbdev} != 0 ]]
906     then
907     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die
908     fi
909     fi
910   fi   fi
  echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die  
  echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die  
911  }  }
912    
913  install_umount_rootfs()  install_umount_rootfs()
914  {  {
915   cd /   cd /
916   umount ${INSTALLPATH}/boot || die   if [[ -n ${BOOTHDD} ]]
917   umount ${INSTALLPATH} || die   then
918   swapoff ${SWAPHDD} || die   umount ${INSTALLPATH}/boot || die
919  }   fi
920     if [[ -n ${ROOTHDD} ]]
921  install_umount_rootfs_flash()   then
922  {   umount ${INSTALLPATH} || die
923   cd /   fi
924   umount ${INSTALLPATH} || die   if [[ -n ${SWAPHDD} ]]
925     then
926     swapoff ${SWAPHDD} || die
927     fi
928  }  }
929    
930  install_do_reboot()  install_do_reboot()
# Line 848  install_do_reboot() Line 933  install_do_reboot()
933  }  }
934    
935  #################################################  #################################################
936  #     Install Ablauf Scripte #  #     Install Main Scripts #
937  #################################################  #################################################
938    
939  run_install_normal()  run_install()
940  {  {
941     local method="$1"
942    
943     # setup install environment
944     export KERNELOPTS="${DEFAULT_KERNELOPTS}"
945     export GRUBLEGACYOPTS="${GRUBLEGACYOPTS}"
946     export GRUB2OPTS="${GRUB2OPTS}"
947     export GRUB2GFXPAYLOAD="${DEFAULT_GRUB2GFXPAYLOAD}"
948     export FORMFACTOR="${DEFAULT_FORMFACTOR}"
949     export FORMAT_FILESYSTEM="${DEFAULT_FORMAT_FILESYSTEM}"
950    
951     case "${method}" in
952     auto)
953     export INSTALL_METHOD="${method}"
954     ;;
955     normal)
956     export INSTALL_METHOD="${method}"
957     ;;
958     single)
959     export INSTALL_METHOD="${method}"
960     ;;
961     *)
962     echo "Unknown install method '${method}', aborting."
963     exit 1
964     ;;
965     esac
966    
967   dialog_hardware_detection   dialog_hardware_detection
968    
969   dialog_setup_hdd_partitions_manuell   case "${INSTALL_METHOD}" in
970     auto) dialog_setup_hdd_partitions_auto ;;
971     *) dialog_setup_hdd_partitions_manuell ;;
972     esac
973   dialog_setup_hdd_format   dialog_setup_hdd_format
974   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
975   install_mount_rootfs   install_mount_rootfs
# Line 873  run_install_normal() Line 987  run_install_normal()
987   dialog_install_successful   dialog_install_successful
988  }  }
989    
 run_install_flash()  
 {  
  dialog_hardware_detection  
   
  dialog_setup_hdd_partitions_manuell_flash  
  dialog_setup_hdd_format  
  setup_hdd_format_flash > /dev/null  
  install_mount_rootfs_flash  
  (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image  
   
  dialog_install_settings  
  sleep 1  
  install_system_settings_flash  
  install_initrd_chroot  
   
  dialog_install_bootsector  
  install_bootsector_chroot  
   
  install_umount_rootfs_flash  
  dialog_install_successful  
 }  
   
 run_install_auto()  
 {  
  dialog_hardware_detection  
   
  dialog_setup_hdd_partitions_auto  
  dialog_setup_hdd_format  
  setup_hdd_format_flash > /dev/null  
  install_mount_rootfs_flash  
  (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image  
   
  dialog_install_settings  
  sleep 1  
  install_system_settings_flash  
  install_initrd_chroot  
   
  dialog_install_bootsector  
  install_bootsector_chroot  
   
  install_umount_rootfs_flash  
  dialog_install_successful  
 }  
   
990  dialog_main  dialog_main
991    
992  exit 0  exit 0

Legend:
Removed from v.3202  
changed lines
  Added in v.6825