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 3256 by niro, Thu Sep 22 09:09:21 2011 UTC revision 6839 by niro, Thu Jul 23 12:57:23 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/generic.sh
14  ### bugfix ###############################  source ${MLIBDIR}/functions/hwdetection.sh
 cdromdev="$(echo ${cdromdev} | sed 's/ //')"  
 ########################################  
15    
16  ### System/Config Version  ### System/Config Version
17  VERSION="%VERSIONTAG%"  VERSION="@@VERSION@@"
18  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
19    
20    # locations
21  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
22  INSTALLPATH="/mnt/magellan"  INSTALL_ROOT="/mnt/magellan"
   
 ### WICHTIG: anzahl lines in der autosta_lx.tar.gz -1  
 CURRENTLINE=0  
 #TOTALLINES=11072 # -> now in images.conf  
23    
24    # default system settings
25  # standard kernel opts  # standard kernel opts
26  KERNELOPTS="quiet video=1024x768"  DEFAULT_KERNELOPTS="quiet video=1024x768"
27    
28  # grub options  # grub options
29  GRUBLEGACYOPTS=""  DEFAULT_GRUBLEGACYOPTS=""
30  GRUB2OPTS=""  DEFAULT_GRUB2OPTS=""
31    DEFAULT_GRUB2GFXPAYLOAD="1024x768x16,1024x768"
 # fdisk options  
 FDISKPARTIONBELOW256MB=0  
32    
33  # default specialdevices  # default specialdevices
34  SPECIALDEVICE=""  DEFAULT_FORMFACTOR="desktop"
35    
36  # target filesystem  # target filesystem
37  FORMAT_FILESYSTEM="ext4"  DEFAULT_FORMAT_FILESYSTEM="ext4"
38    
39    # initialize global variables so they are exportable
40    INSTALL_METHOD=""
41    KERNELOPTS=""
42    GRUBLEGACYOPTS=""
43    GRUB2OPTS=""
44    GRUB2GFXPAYLOAD=""
45    FORMFACTOR=""
46    FORMAT_FILESYSTEM=""
47    FDISKPARTIONBELOW256MB=0
48    SPECIALDEVICE=""
49    FLASHDISK=0
50    ### linecount of system.tar.gz -1 !
51    CURRENTLINE=0
52    #TOTALLINES=11072 # -> now in images.conf
53    
54  #################################################  #################################################
55  #  DIALOG BOXEN #  #  DIALOG BOXES #
56  #################################################  #################################################
57    
58  die()  die()
# Line 56  die() Line 60  die()
60   ERROR=$1   ERROR=$1
61   RETVAL=$?   RETVAL=$?
62   dialog_install_failure   dialog_install_failure
63     trap_exit
64   exit 1   exit 1
65  }  }
66    
# Line 79  dialog_warning() Line 84  dialog_warning()
84    
85  dialog_setup_hdd_info()  dialog_setup_hdd_info()
86  {  {
87     case "${INSTALL_METHOD}" in
88     auto)
89     dialog_setup_hdd_info_auto
90     dialog_setup_hdd_create_partitions
91     ;;
92     normal) dialog_setup_hdd_info_normal ;;
93     single) dialog_setup_hdd_info_single ;;
94     flash) dialog_setup_hdd_info_flash ;;
95     esac
96    }
97    
98    dialog_setup_hdd_info_normal()
99    {
100   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
101    
102   dialog \   dialog \
# Line 93  dialog_setup_hdd_info() Line 111  dialog_setup_hdd_info()
111   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
112  }  }
113    
114  dialog_setup_hdd_info_flash()  dialog_setup_hdd_info_single()
115  {  {
116   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
117    
# Line 107  dialog_setup_hdd_info_flash() Line 125  dialog_setup_hdd_info_flash()
125   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
126  }  }
127    
128    dialog_setup_hdd_info_flash()
129    {
130     local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
131    
132     dialog \
133     --colors \
134     --title "[ Festplatten Partitionierung ]" \
135     --backtitle "${TITLE}" \
136     --ok-label "Weiter" \
137     --msgbox "\nBitte legen Sie 2 Partitionen an.\n\n\
138     [ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
139     [ \Z3${SHDD}2\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\
140     Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
141    }
142    
143  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
144  {  {
145   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
# Line 136  dialog_setup_system_menu() Line 169  dialog_setup_system_menu()
169   "" "" \   "" "" \
170   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
171   "2" "Normale IDE-Disk (Manuell)" \   "2" "Normale IDE-Disk (Manuell)" \
172   "3" "Flash-Speicher (Manuell)")   "3" "Normale IDE Disk (Single)" \
173     "4" "Flash SDHC/NAND oder USBStick (Manuell)")
174   RES=$?   RES=$?
175   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
176   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
177   then   then
178   case "${i}" in   case "${i}" in
179   "1") run_install_auto ;;   "1") run_install auto ;;
180           "2") run_install_normal ;;   "2") run_install normal ;;
181   "3") run_install_flash ;;   "3") run_install single ;;
182     "3") run_install flash ;;
183   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
184   esac   esac
185   fi   fi
# Line 155  dialog_hardware_detection() Line 190  dialog_hardware_detection()
190   local i   local i
191   local hwtmp   local hwtmp
192    
193   if [ -x $(which mktemp &> /dev/null) ]   if [ -x $(type -P mktemp) ]
194   then   then
195   hwtmp="$(mktemp)"   hwtmp="$(mktemp)"
196   else   else
197   hwtmp="/tmp/hwtmp.sh"   hwtmp="/tmp/hwtmp.sh"
198   fi   fi
199    
200   [[ ! -z ${installdevs} ]] && installdevs=""   run_hardware_detection_disks
201    
202   echo "dialog \\"  > ${hwtmp}   echo "dialog \\"  > ${hwtmp}
203   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
# Line 172  dialog_hardware_detection() Line 207  dialog_hardware_detection()
207   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
208   echo " Festplatten:\n \\" >> ${hwtmp}   echo " Festplatten:\n \\" >> ${hwtmp}
209    
210   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${ALL_DISKS} ]]
211   then   then
212   for i in ${scsidisks}   for i in ${ALL_DISKS}
213   do   do
214   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
  then  
  echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
  installdevs="${installdevs} ${i}"  
  fi  
215   done   done
216   fi   fi
217    
218   if [[ ! -z ${idedisks} ]]   if [[ ! -z ${ALL_CDROMS} ]]
219   then   then
220   for i in ${idedisks}   echo " \n \\" >> ${hwtmp}
221     echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
222     for i in ${ALL_CDROMS}
223   do   do
224   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
  then  
  echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
  installdevs="${installdevs} ${i}"  
  fi  
225   done   done
226   fi   fi
227    
  if [[ ! -z ${cdromdev} ]]  
  then  
  echo " \n \\" >> ${hwtmp}  
  echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}  
  echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}  
  fi  
   
228   # other devices   # other devices
229   run_hardware_detection   run_hardware_detection
230   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
231   zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;   zotac*) echo " \n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
232   rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;   rangee) echo " \n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
233   *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;   maxdata) echo " \n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
234     i845) echo " \n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
235     *) echo " \n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
236   esac   esac
237     if [[ ${FORMFACTOR} = laptop ]]
238     then
239     echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
240     fi
241     if [[ ${FLASHDISK} = 1 ]]
242     then
243     echo " \n \\ZnFlash Speicher erkannt, F2FS wird als Dateisystem benutzt.\\Zn \\" >> ${hwtmp}
244     fi
245    
246   echo " \" 13 70" >> ${hwtmp}   echo " \" 14 70" >> ${hwtmp}
247   chmod a+x ${hwtmp}   chmod a+x ${hwtmp}
248   ${hwtmp}   ${hwtmp}
249    
# Line 222  dialog_hardware_detection() Line 254  dialog_hardware_detection()
254   fi   fi
255  }  }
256    
257  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions()
258  {  {
259   local i   local i
260    
261   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
262   then   then
263   dialog \   dialog \
264   --backtitle "${TITLE}" \   --backtitle "${TITLE}" \
# Line 242  dialog_setup_hdd_partitions_manuell() Line 274  dialog_setup_hdd_partitions_manuell()
274   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> /tmp/hddtmp.sh
275   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
276    
277   for i in ${installdevs}   for i in ${ALL_DISKS}
278   do   do
279   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
280   done   done
# Line 255  dialog_setup_hdd_partitions_manuell() Line 287  dialog_setup_hdd_partitions_manuell()
287   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
288   then   then
289   dialog_setup_hdd_info   dialog_setup_hdd_info
290   setup_hdd_partitions_manuell   setup_hdd_partitions
  fi  
  fi  
 }  
   
 dialog_setup_hdd_partitions_manuell_flash()  
 {  
  local i  
   
  if [[ -z ${installdevs} ]]  
  then  
  dialog \  
  --backtitle "${TITLE}" \  
  --ok-label "Beenden" \  
  --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
  exit 1  
  else  
   
  echo "dialog \\" > /tmp/hddtmp.sh  
  echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh  
  echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh  
  echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh  
  echo "--stdout \\" >> /tmp/hddtmp.sh  
  echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh  
   
  for i in ${installdevs}  
  do  
  echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
  done  
  echo -e "\n" >> /tmp/hddtmp.sh  
   
  chmod a+x /tmp/hddtmp.sh  
  HDD="$(/tmp/hddtmp.sh)"  
  RES=$?  
  [[ ${RES} -eq 1 ]] && return 1  
  if [[ ${RES} -eq 0 ]]  
  then  
  dialog_setup_hdd_info_flash  
  setup_hdd_partitions_manuell_flash  
  fi  
  fi  
 }  
   
 dialog_setup_hdd_partitions_auto()  
 {  
  local i  
   
  if [[ -z ${installdevs} ]]  
  then  
  dialog \  
  --backtitle "${TITLE}" \  
  --ok-label "Beenden" \  
  --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70  
  exit 1  
  else  
   
  echo "dialog \\" > /tmp/hddtmp.sh  
  echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh  
  echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh  
  echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh  
  echo "--stdout \\" >> /tmp/hddtmp.sh  
  echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh  
   
  for i in ${installdevs}  
  do  
  echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh  
  done  
  echo -e "\n" >> /tmp/hddtmp.sh  
   
  chmod a+x /tmp/hddtmp.sh  
  HDD="$(/tmp/hddtmp.sh)"  
  RES=$?  
  [[ ${RES} -eq 1 ]] && return 1  
  if [[ ${RES} -eq 0 ]]  
  then  
  dialog_setup_hdd_info_auto  
  dialog_setup_hdd_create_partitions  
  setup_hdd_partitions_auto  
291   fi   fi
292   fi   fi
293  }  }
# Line 378  dialog_install_meter() Line 333  dialog_install_meter()
333   return 0   return 0
334  }  }
335    
   
336  dialog_install_bootsector()  dialog_install_bootsector()
337  {  {
338   dialog \   dialog \
# Line 425  dialog_main() Line 379  dialog_main()
379   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
380   then   then
381   case ${METHOD} in   case ${METHOD} in
382           "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
383   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
384   "3") install_do_reboot ;;   "3") install_do_reboot ;;
385   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
# Line 435  dialog_main() Line 389  dialog_main()
389  }  }
390    
391  #################################################  #################################################
392  # Install Komandos #  # Install Commands #
393  #################################################  #################################################
394  run_hardware_detection()  run_hardware_detection()
395  {  {
396   local hwinfo   local hwinfo
397     hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
  hwinfo="$(hwinfo --bios --storage)"  
398    
399   # check for special devices/clients:   # check for special devices/clients:
400   # 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 453  run_hardware_detection() Line 406  run_hardware_detection()
406   if [[ $(< ${i}) = 1 ]]   if [[ $(< ${i}) = 1 ]]
407   then   then
408   removable=1   removable=1
409     # we assume that all removable disks are flash disks
410     export FLASHDISK=1
411   fi   fi
412   done   done
413    
414   # 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
415   export GRUBLEGACYOPTS="rootdelay=8"   export GRUBLEGACYOPTS="rootdelay=8"
416   export SPECIALDEVICE="zotac"   # there are two zotac types in the wild, nvidia based gfx and intel
417     if [[ ! -z $(echo "${hwinfo}" | grep -i nouveau) ]]
418     then
419     export SPECIALDEVICE="zotac_nvidia"
420     else
421     export SPECIALDEVICE="zotac_intel"
422     fi
423   fi   fi
424    
425   # check for special devices/clients:   # check for special devices/clients:
# Line 470  run_hardware_detection() Line 431  run_hardware_detection()
431   export SPECIALDEVICE="rangee"   export SPECIALDEVICE="rangee"
432   export GRUBLEGACYOPTS=""   export GRUBLEGACYOPTS=""
433   fi   fi
434    
435     # check for special devices/clients:
436     # check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
437     if [[ ! -z $(echo "${hwinfo}" | grep -i i810) ]] || [[ ! -z $(echo "${hwinfo}" | grep -i i815) ]]
438     then
439     export SPECIALDEVICE="maxdata"
440     export GRUBLEGACYOPTS=""
441     fi
442    
443     # check for i845 Chipsets and disable KMS and use 915 drm driver
444     if [[ ! -z $(echo "${hwinfo}" | grep -i i845) ]]
445     then
446     export SPECIALDEVICE="i845"
447     # unset default video=1024x768 opt or the drm driver breaks
448     export KERNELOPTS="quiet"
449     export GRUBLEGACYOPTS=""
450     # enable full kms support
451     export GRUB2GFXPAYLOAD="keep"
452     fi
453    
454     # check for radeon gfxcards
455     if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
456     then
457     # enable full kms support
458     export GRUB2GFXPAYLOAD="keep"
459     fi
460    
461     # check for special devices/clients:
462     # check for laptops and activate cpufreq scaling
463     if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
464     then
465     export FORMFACTOR="laptop"
466     export KERNELOPTS="${KERNELOPTS} cpufreq.governor=ondemand"
467     fi
468    }
469    
470    run_hardware_detection_disks()
471    {
472     local bootdev
473    
474     # all disks but exclude ramdisks
475     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
476     # remove the boot device from ALL_DISKS if it was an usbstick
477     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
478     then
479     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
480     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
481     fi
482     export ALL_CDROMS="$(get_hwinfo cdrom)"
483  }  }
484    
485  hdd_size_below_256mb()  hdd_size_below_256mb()
# Line 490  hdd_size_below_256mb() Line 500  hdd_size_below_256mb()
500   return "${retval}"   return "${retval}"
501  }  }
502    
503  setup_hdd_partitions_auto()  setup_hdd_partitions()
504  {  {
505   ROOTHDD="${HDD}1"   case "${INSTALL_METHOD}" in
506     normal)
507     BOOTHDD="${HDD}1"
508     SWAPHDD="${HDD}2"
509     ROOTHDD="${HDD}3"
510     ;;
511    
512     single|auto)
513     BOOTHDD=""
514     SWAPHDD=""
515     ROOTHDD="${HDD}1"
516     ;;
517    
518     flash)
519     BOOTHDD="${HDD}1"
520     SWAPHDD=""
521     ROOTHDD="${HDD}2"
522     ;;
523     esac
524    
525   # run this only if FDISKPARTITIONBELOW256MB is not already 1   if [[ ${INSTALL_METHOD} = auto ]]
  if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]  
526   then   then
527   if hdd_size_below_256mb ${HDD}   # run this only if FDISKPARTITIONBELOW256MB is not already 1
528     if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
529   then   then
530   FDISKPARTIONBELOW256MB=1   if hdd_size_below_256mb ${HDD}
531   else   then
532   FDISKPARTIONBELOW256MB=0   FDISKPARTIONBELOW256MB=1
533     else
534     FDISKPARTIONBELOW256MB=0
535     fi
536   fi   fi
  fi  
537    
538   ## delete disk   ## delete disk
539   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
540    
541   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
542   then   then
543   ## setup one bootable partition   ## setup one bootable partition
544   #1. n= new disk   #1. n= new disk
545   #2. p= primary disk   #2. p= primary disk
546   #3. 1= first partition   #3. 1= first partition
547   #4. 2= default sector start // small disk needs more space for grub2 mbr sector   #4. 2= default sector start // small disk needs more space for grub2 mbr sector
548   #5. ''= defaul sector end   #5. ''= defaul sector end
549   #6. a= bootable flag   #6. a= bootable flag
550   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
551   #8. w= write/quit   #8. w= write/quit
552   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
553  n  n
554  p  p
555  1  1
# Line 529  a Line 559  a
559  1  1
560  w  w
561  EOF  EOF
562   else   else
563   ## setup one bootable partition   ## setup one bootable partition
564   #1. n= new disk   #1. n= new disk
565   #2. p= primary disk   #2. p= primary disk
566   #3. 1= first partition   #3. 1= first partition
567   #4. ''= default sector start   #4. ''= default sector start
568   #5. ''= defaul sector end   #5. ''= defaul sector end
569   #6. a= bootable flag   #6. a= bootable flag
570   #7. 1= boot flag for partition 1   #7. 1= boot flag for partition 1
571   #8. w= write/quit   #8. w= write/quit
572   fdisk ${HDD} &> /dev/null << EOF   fdisk ${HDD} &> /dev/null << EOF
573  n  n
574  p  p
575  1  1
# Line 549  a Line 579  a
579  1  1
580  w  w
581  EOF  EOF
582     fi
583     else
584     ## hdds partitionieren manuell
585     cfdisk ${HDD} || die
586   fi   fi
587  }  }
588    
 setup_hdd_partitions_manuell()  
 {  
  BOOTHDD="${HDD}1"  
  SWAPHDD="${HDD}2"  
  ROOTHDD="${HDD}3"  
   
  ## hdds partitionieren manuell  
  cfdisk ${HDD} || die  
 }  
   
 setup_hdd_partitions_manuell_flash()  
 {  
  ROOTHDD="${HDD}1"  
   
  ## hdds partitionieren manuell  
  cfdisk ${HDD} || die  
 }  
   
589  setup_hdd_format()  setup_hdd_format()
590  {  {
591   mkswap ${SWAPHDD} || die   if [[ -n ${SWAPHDD} ]]
592   mke2fs -j -q ${BOOTHDD} || die   then
593   mke2fs -j -q ${ROOTHDD} || die   mkswap ${SWAPHDD} || die
594  }   fi
595     if [[ -n ${BOOTHDD} ]]
596  setup_hdd_format_flash()   then
597  {   # f2fs is not grub/grub2 compatible
598   mke2fs -j -q ${ROOTHDD} || die   if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
599     then
600     mkfs.ext2 -q ${BOOTHDD} || die
601     else
602     mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die
603     fi
604     fi
605     if [[ -n ${ROOTHDD} ]]
606     then
607     mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || die
608     fi
609  }  }
610    
611  install_mount_rootfs()  install_mount_rootfs()
612  {  {
613   swapon ${SWAPHDD} || die   local opts
  mount ${ROOTHDD} ${INSTALLPATH} || die  
  install -d ${INSTALLPATH}/boot || die  
  mount ${BOOTHDD} ${INSTALLPATH}/boot || die  
  cd ${INSTALLPATH} || die  
 }  
614    
615  install_mount_rootfs_flash()   if [[ -n ${SWAPHDD} ]]
616  {   then
617   mount ${ROOTHDD} ${INSTALLPATH} || die   swapon ${SWAPHDD} || die
618   install -d ${INSTALLPATH}/boot || die   fi
619   cd ${INSTALLPATH} || die   if [[ -n ${ROOTHDD} ]]
620     then
621     # be safe here, append file system type to mount
622     # just in case the f2fs module was not autoloaded
623     [[ ${FORMAT_FILESYSTEM} = f2fs ]] && opts="-t fs2fs"
624     mount ${opts} ${ROOTHDD} ${INSTALL_ROOT} || die
625     fi
626     if [[ -n ${BOOTHDD} ]]
627     then
628     install -d ${INSTALL_ROOT}/boot || die
629     mount ${BOOTHDD} ${INSTALL_ROOT}/boot || die
630     fi
631    
632     cd ${INSTALL_ROOT} || die
633  }  }
634    
635  install_system_image()  install_system_image()
636  {  {
637   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALL_ROOT}
638  }  }
639    
640  install_bootsector_chroot()  install_bootsector_chroot()
641  {  {
642   local my_roothdd   local my_roothdd
643   local grubconf=${INSTALLPATH}/boot/grub/grub.conf   local grubconf=${INSTALL_ROOT}/boot/grub/grub.conf
644   local grub2conf=/boot/grub/grub.cfg   local grub2conf=/boot/grub/grub.cfg
645     local CONFIG
646    
647   # check for grub2   # check for grub2
648   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALL_ROOT}/sbin/grub-mkconfig ]]
649   then   then
650   # needed by grub-mkconfig on the first run   # needed by grub-mkconfig on the first run
651   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]   if [[ ! -f ${INSTALL_ROOT}/boot/grub/video.lst ]]
652   then   then
653   install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die   install -m0644 ${INSTALL_ROOT}/lib/grub/*/video.lst ${INSTALL_ROOT}/boot/grub/video.lst || die
654   fi   fi
655    
656   # set kernelopts   # set kernelopts
657   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALL_ROOT}/etc/conf.d/grub ]]
658   then   then
659   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}\":" ${INSTALL_ROOT}/etc/conf.d/grub || die
660     sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALL_ROOT}/etc/conf.d/grub || die
661   else   else
662   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   CONFIG=${INSTALL_ROOT}/etc/conf.d/grub
663   fi   clearconfig
664   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
665   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   addconfig "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\""
666   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   fi
667   echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die   CONFIG=${INSTALL_ROOT}/.installrc
668     clearconfig
669     addconfig 'grub-mkdevicemap'
670     addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
671     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
672     addconfig "exit 0"
673    
674   # grub-legacy   # grub-legacy
675   else   else
676   ### grubconf schreiben   ### grubconf schreiben
677   source ${INSTALLPATH}/boot/kernelversion   source ${INSTALL_ROOT}/boot/kernelversion
678    
679   #for alx only   #for alx only
680   if [ -e ${INSTALLPATH}/etc/alx_version ]   if [ -e ${INSTALL_ROOT}/etc/alx_version ]
681   then   then
682   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
683   source ${INSTALLPATH}/etc/alx_version   source ${INSTALL_ROOT}/etc/alx_version
684   KRNVER="ALX-${ALXVER}"   KRNVER="ALX-${ALXVER}"
685   ALXVER="${OLD_ALXVER}"   ALXVER="${OLD_ALXVER}"
686   fi   fi
# Line 656  install_bootsector_chroot() Line 697  install_bootsector_chroot()
697   my_roothdd="${ROOTHDD}"   my_roothdd="${ROOTHDD}"
698   fi   fi
699    
700   : > ${grubconf} || die   CONFIG="${grubconf}"
701   echo "default 0" >> ${grubconf} || die   clearconfig
702   echo "timeout 3" >> ${grubconf} || die   addconfig "default 0"
703     addconfig "timeout 3"
704   # using current root password   # using current root password
705   echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die   addconfig "password --md5 $(cat ${INSTALL_ROOT}/etc/shadow | grep root | cut -d: -f2)"
706     addconfig
707   echo  >> ${grubconf} || die   addconfig "# normal boot"
708   echo "# normal boot" >> ${grubconf} || die   addconfig "title ${KRNVER}"
709   echo "title ${KRNVER}" >> ${grubconf} || die   addconfig "root (hd0,0)"
710   echo "root (hd0,0)" >> ${grubconf} || die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}"
  echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die  
711   if is_initrd_supported   if is_initrd_supported
712   then   then
713   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
714   fi   fi
715     addconfig
716   echo >> ${grubconf} || die   addconfig "# admin boot"
717   echo "# admin boot" >> ${grubconf} || die   addconfig "title ${KRNVER} - Re-run hardware-detection"
718   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die   addconfig "lock"
719   echo "lock"  >> ${grubconf} || die   addconfig "root (hd0,0)"
720   echo "root (hd0,0)" >> ${grubconf} || die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection"
  echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die  
721   if is_initrd_supported   if is_initrd_supported
722   then   then
723   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
724   fi   fi
725     addconfig
726   echo >> ${grubconf} || die   addconfig "title ${KRNVER} - Reset *all* local settings"
727   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die   addconfig "lock"
728   echo "lock"  >> ${grubconf} || die   addconfig "root (hd0,0)"
729   echo "root (hd0,0)" >> ${grubconf} || die   addconfig "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings"
  echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die  
730   if is_initrd_supported   if is_initrd_supported
731   then   then
732   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
733   fi   fi
734    
735   # bootsector schreiben chrooted schreiben (lfs/magellan)   # write bootsector chrooted (lfs/magellan)
736   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   CONFIG=${INSTALL_ROOT}/.installrc
737  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null   clearconfig
738  root (hd0,0)   addconfig '/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null'
739  setup (hd0)   addconfig 'root (hd0,0)'
740  quit   addconfig 'setup (hd0)'
741  EOF   addconfig 'quit'
742  exit 0   addconfig 'EOF'
743  CHROOTEOF   addconfig 'exit 0'
744   fi   fi
745    
746   ## enters chroot   ## enter chroot
747   mount -t proc proc ${INSTALLPATH}/proc   enter_chroot_installrc
  mount -t sysfs sysfs ${INSTALLPATH}/sys  
  mount -o bind /dev ${INSTALLPATH}/dev  
  chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i  
  umount ${INSTALLPATH}/proc  
  umount ${INSTALLPATH}/sys  
  umount ${INSTALLPATH}/dev  
  rm ${INSTALLPATH}/root/.installrc  
748  }  }
749    
750  is_initrd_supported()  is_initrd_supported()
751  {  {
752   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
753   [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0   [[ -x ${INSTALL_ROOT}/sbin/mkinitrd ]] && return 0
754   return 1   return 1
755  }  }
756    
757  install_initrd_chroot()  install_initrd_chroot()
758  {  {
759     local CONFIG
760    
761   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
762   is_initrd_supported || return 0   is_initrd_supported || return 0
763    
764     FSMODS="${FORMAT_FILESYSTEM}"
765   DISKMODS="sd_mod"   DISKMODS="sd_mod"
766   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
767   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"
768   SATAMODS="sata_via sata_sis sata_nv"   SATAMODS="sata_via sata_sis sata_nv"
769   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"   DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
770     OTHERMODS=""
771   case ${SPECIALDEVICE} in   case ${SPECIALDEVICE} in
772   zotac) FBMODS="" ;;   zotac_intel|i845) FBMODS=""; DRMMODS="i915" ;;
773     zotac_nvidia) FBMODS=""; DRMMODS="nouveau" ;;
774   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
775     # not working with kms enabled drivers -> segfaults
776     #maxdata) FBMODS="i810fb" ;; ## check for maxdata / i810/ i815 Chipsets and disable KMS and use i810fb frambuffer
777     maxdata) FBMODS="" ;;
778   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
779   esac   esac
780    
781     # add a filesystems recoqnized by the bootloader if the current ${FORMAT_FILESYSTEM} is not supported
782     case "${FORMAT_FILESYSTEM}" in
783     f2fs) FSMODS+=" ext2" ;;
784     esac
785    
786     if [[ ${FORMFACTOR} = laptop ]]
787     then
788     OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
789     fi
790    
791   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
792   install -d ${INSTALLPATH}/etc/modprobe.d || die   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/uvesafb.conf
793   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die   clearconfig
794     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
795    
796   # install an appropriate viafb.conf   # install an appropriate viafb.conf
797   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/viafb.conf
798     clearconfig
799   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
800  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd  
801  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null   # install an appropriate i810fb.conf
802  exit 0   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/i810fb.conf
803  CHROOTEOF   clearconfig
804     addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
805   ## enters chroot  
806   mount -t proc proc ${INSTALLPATH}/proc   CONFIG=${INSTALL_ROOT}/.installrc
807   mount -t sysfs sysfs ${INSTALLPATH}/sys   clearconfig
808   mount -o bind /dev ${INSTALLPATH}/dev   addconfig 'echo "MODULES=\"${FSMODS} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd'
809   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i   addconfig 'mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null'
810   umount ${INSTALLPATH}/proc   addconfig 'exit 0'
811   umount ${INSTALLPATH}/sys   ## enter chroot
812   umount ${INSTALLPATH}/dev   enter_chroot_installrc
  rm ${INSTALLPATH}/root/.installrc  
813  }  }
814    
815  is_uuid_supported()  is_uuid_supported()
816  {  {
817   if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]   # f2fs needs special treatments as the old busybox does not support this fs
818     # use the blkid from util-linux instead of busybox
819     if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
820   then   then
821   # only detect uuids if supported   if [[ -x $(type -P blkid) ]]
822   if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]   then
823     return 0
824     fi
825     else
826     if [[ -x $(type -P busybox.mkinitrd) ]]
827   then   then
828   return 0   # only detect uuids if supported
829     if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
830     then
831     return 0
832     fi
833   fi   fi
834   fi   fi
835    
# Line 781  get_uuid() Line 841  get_uuid()
841   local UUID   local UUID
842   local SEC_TYPE   local SEC_TYPE
843   local TYPE   local TYPE
844     local blkidcmd
845    
846   local dev="$1"   local dev="$1"
847   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && die "no dev given"
# Line 790  get_uuid() Line 851  get_uuid()
851   then   then
852   eval "${dev}"   eval "${dev}"
853   else   else
854   eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')   # f2fs needs special treatments as the old busybox does not support this fs
855     # use the blkid from util-linux instead of busybox
856     if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
857     then
858     blkidcmd="blkid"
859     else
860     blkidcmd="busybox.mkinitrd blkid"
861     fi
862     eval $(${blkidcmd} ${dev} | grep "${dev}:" | sed 's/.*:\ //')
863   fi   fi
864   echo "${UUID}"   echo "${UUID}"
865  }  }
866    
867  install_system_settings()  install_system_settings()
868  {  {
869   # schreibe fstab   local CONFIG
870    
871     # write fstab
872     CONFIG=${INSTALL_ROOT}/etc/fstab
873     clearconfig
874   if is_uuid_supported   if is_uuid_supported
875   then   then
876   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if [[ -n ${BOOTHDD} ]]
877   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
878     addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
879     fi
880     if [[ -n ${ROOTHDD} ]]
881     then
882     addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
883     fi
884   else   else
885   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if [[ -n ${BOOTHDD} ]]
886   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
887     addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"
888     fi
889     if [[ -n ${ROOTHDD} ]]
890     then
891     addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"
892     fi
893   fi   fi
894   # 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
895   #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   #addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"
896   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
897   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
898    
899   # install network config skeleton   # install network config skeleton
900   install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die   install -m0644 ${INSTALL_ROOT}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALL_ROOT}/etc/conf.d/ || die
 }  
901    
902  install_system_settings_flash()   # intel framebufer quirk
903  {   if [[ -e /proc/fb ]]
  # schreibe fstab  
  if is_uuid_supported  
904   then   then
905   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   if [[ ! -z $(grep 'inteldrmfb' /proc/fb) ]]
906   else   then
907   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
908     if [[ ${fbdev} != 0 ]]
909     then
910     sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALL_ROOT}/etc/splash/splash.conf || die
911     fi
912     fi
913   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  
914  }  }
915    
916  install_umount_rootfs()  install_umount_rootfs()
917  {  {
918   cd /   cd /
919   umount ${INSTALLPATH}/boot || die   if [[ -n ${BOOTHDD} ]]
920   umount ${INSTALLPATH} || die   then
921   swapoff ${SWAPHDD} || die   umount ${INSTALL_ROOT}/boot || die
922  }   fi
923     if [[ -n ${ROOTHDD} ]]
924  install_umount_rootfs_flash()   then
925  {   umount ${INSTALL_ROOT} || die
926   cd /   fi
927   umount ${INSTALLPATH} || die   if [[ -n ${SWAPHDD} ]]
928     then
929     swapoff ${SWAPHDD} || die
930     fi
931  }  }
932    
933  install_do_reboot()  install_do_reboot()
# Line 848  install_do_reboot() Line 936  install_do_reboot()
936  }  }
937    
938  #################################################  #################################################
939  #     Install Ablauf Scripte #  #     Install Main Scripts #
940  #################################################  #################################################
941    
942  run_install_normal()  run_install()
943  {  {
944     local method="$1"
945    
946     # setup install environment
947     export KERNELOPTS="${DEFAULT_KERNELOPTS}"
948     export GRUBLEGACYOPTS="${GRUBLEGACYOPTS}"
949     export GRUB2OPTS="${GRUB2OPTS}"
950     export GRUB2GFXPAYLOAD="${DEFAULT_GRUB2GFXPAYLOAD}"
951     export FORMFACTOR="${DEFAULT_FORMFACTOR}"
952     export FORMAT_FILESYSTEM="${DEFAULT_FORMAT_FILESYSTEM}"
953    
954     case "${method}" in
955     auto)
956     export INSTALL_METHOD="${method}"
957     ;;
958     normal)
959     export INSTALL_METHOD="${method}"
960     ;;
961     single)
962     export INSTALL_METHOD="${method}"
963     ;;
964     flash)
965     export FORMAT_FILESYSTEM="f2fs"
966     export INSTALL_METHOD="${method}"
967     ;;
968     *)
969     echo "Unknown install method '${method}', aborting."
970     exit 1
971     ;;
972     esac
973    
974   dialog_hardware_detection   dialog_hardware_detection
975    
976   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions
977   dialog_setup_hdd_format   dialog_setup_hdd_format
978   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
979   install_mount_rootfs   install_mount_rootfs
# Line 873  run_install_normal() Line 991  run_install_normal()
991   dialog_install_successful   dialog_install_successful
992  }  }
993    
994  run_install_flash()  # set some proper traps
995  {  trap "trap_exit" SIGINT SIGQUIT
  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  
 }  
996    
997  dialog_main  dialog_main
998    

Legend:
Removed from v.3256  
changed lines
  Added in v.6839