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 6770 by niro, Tue Jul 21 12:25:48 2015 UTC revision 6959 by niro, Wed Jul 29 09:30: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="@@LIBDIR@@"
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  GRUB2GFXPAYLOAD="1024x768x16,1024x768"  DEFAULT_GRUB2GFXPAYLOAD="1024x768x16,1024x768"
   
 # fdisk options  
 FDISKPARTIONBELOW256MB=0  
32    
33  # default specialdevices  # default specialdevices
34  SPECIALDEVICE=""  DEFAULT_FORMFACTOR="desktop"
 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    FORMAT_FILESYSTEM_BOOTHDD=""
48    FORMAT_FILESYSTEM_ROOTHDD=""
49    FDISKPARTIONBELOW256MB=0
50    SPECIALDEVICE=""
51    FLASHDISK=0
52    ### linecount of system.tar.gz -1 !
53    CURRENTLINE=0
54    #TOTALLINES=11072 # -> now in images.conf
55    
56  #################################################  #################################################
57  #  DIALOG BOXEN #  #  DIALOG BOXES #
58  #################################################  #################################################
59    
60  die()  die()
# Line 58  die() Line 62  die()
62   ERROR=$1   ERROR=$1
63   RETVAL=$?   RETVAL=$?
64   dialog_install_failure   dialog_install_failure
65     trap_exit
66   exit 1   exit 1
67  }  }
68    
# Line 81  dialog_warning() Line 86  dialog_warning()
86    
87  dialog_setup_hdd_info()  dialog_setup_hdd_info()
88  {  {
89     case "${INSTALL_METHOD}" in
90     auto)
91     dialog_setup_hdd_info_auto
92     dialog_setup_hdd_create_partitions
93     ;;
94     normal) dialog_setup_hdd_info_normal ;;
95     single) dialog_setup_hdd_info_single ;;
96     flash) dialog_setup_hdd_info_flash ;;
97     esac
98    }
99    
100    dialog_setup_hdd_info_normal()
101    {
102   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"   local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
103    
104   dialog \   dialog \
# Line 95  dialog_setup_hdd_info() Line 113  dialog_setup_hdd_info()
113   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
114  }  }
115    
116  dialog_setup_hdd_info_flash()  dialog_setup_hdd_info_single()
117  {  {
118   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
119    
# Line 109  dialog_setup_hdd_info_flash() Line 127  dialog_setup_hdd_info_flash()
127   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
128  }  }
129    
130    dialog_setup_hdd_info_flash()
131    {
132     local SHDD="$(echo ${HDD} | sed 's/\/dev\///')"
133    
134     dialog \
135     --colors \
136     --title "[ Festplatten Partitionierung ]" \
137     --backtitle "${TITLE}" \
138     --ok-label "Weiter" \
139     --msgbox "\nBitte legen Sie 2 Partitionen an.\n\n\
140     [ \Z3${SHDD}1\Zn ] Typ: \Z3Linux\Zn mit ca. 50MB\n\
141     [ \Z3${SHDD}2\Zn ] Typ: \Z3Linux \Zn mit dem Rest (min. 256MB)\n\n\
142     Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
143    }
144    
145  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
146  {  {
147   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
# Line 133  dialog_setup_system_menu() Line 166  dialog_setup_system_menu()
166   --ok-label "Weiter" \   --ok-label "Weiter" \
167   --stdout \   --stdout \
168   --colors \   --colors \
169   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \   --menu "\nWaehlen Sie die Installations-Methode" 14 70 6 \
170   "1" "Automatisches Setup (Empfohlen)" \   "1" "Automatisches Setup (Empfohlen)" \
171   "" "" \   "" "" \
172   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
173   "2" "Normale IDE-Disk (Manuell)" \   "2" "Normale IDE-Disk (Manuell)" \
174   "3" "Flash-Speicher (Manuell)")   "3" "Normale IDE Disk (Single)" \
175     "4" "Flash SDHC/NAND oder USBStick (Manuell)")
176   RES=$?   RES=$?
177   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
178   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
179   then   then
180   case "${i}" in   case "${i}" in
181   "1") run_install_auto ;;   "1") run_install auto ;;
182   "2") run_install_normal ;;   "2") run_install normal ;;
183   "3") run_install_flash ;;   "3") run_install single ;;
184     "4") run_install flash ;;
185   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
186   esac   esac
187   fi   fi
# Line 157  dialog_hardware_detection() Line 192  dialog_hardware_detection()
192   local i   local i
193   local hwtmp   local hwtmp
194    
195   if [ -x $(which mktemp &> /dev/null) ]   if [ -x $(type -P mktemp) ]
196   then   then
197   hwtmp="$(mktemp)"   hwtmp="$(mktemp)"
198   else   else
199   hwtmp="/tmp/hwtmp.sh"   hwtmp="/tmp/hwtmp.sh"
200   fi   fi
201    
202   [[ ! -z ${installdevs} ]] && installdevs=""   run_hardware_detection_disks
203    
204   echo "dialog \\"  > ${hwtmp}   echo "dialog \\"  > ${hwtmp}
205   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
# Line 174  dialog_hardware_detection() Line 209  dialog_hardware_detection()
209   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
210   echo " Festplatten:\n \\" >> ${hwtmp}   echo " Festplatten:\n \\" >> ${hwtmp}
211    
212   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${ALL_DISKS} ]]
213   then   then
214   for i in ${scsidisks}   for i in ${ALL_DISKS}
215   do   do
216   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
  then  
  echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
  installdevs="${installdevs} ${i}"  
  fi  
217   done   done
218   fi   fi
219    
220   if [[ ! -z ${idedisks} ]]   if [[ ! -z ${ALL_CDROMS} ]]
221   then   then
222   for i in ${idedisks}   echo " \n \\" >> ${hwtmp}
223     echo " CDROM Laufwerke:\n \\" >> ${hwtmp}
224     for i in ${ALL_CDROMS}
225   do   do
226   if [[ ${i} != ${cdromdev} ]]   echo " \\Z3${i}\\Zn\n \\" >> ${hwtmp}
  then  
  echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}  
  installdevs="${installdevs} ${i}"  
  fi  
227   done   done
228   fi   fi
229    
  if [[ ! -z ${cdromdev} ]]  
  then  
  echo " \n \\" >> ${hwtmp}  
  echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}  
  echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}  
  fi  
   
230   # other devices   # other devices
231   run_hardware_detection   run_hardware_detection
232   case "${SPECIALDEVICE}" in   case "${SPECIALDEVICE}" in
233   zotac*) echo " \n\n\n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;   zotac*) echo " \n \\Z2Zotac Device erkannt.\\Zn \\" >> ${hwtmp} ;;
234   rangee) echo " \n\n\n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;   rangee) echo " \n \\Z2Rangee Device erkannt.\\Zn \\" >> ${hwtmp} ;;
235   maxdata) echo " \n\n\n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;   maxdata) echo " \n \\Z2Maxdata Device erkannt.\\Zn \\" >> ${hwtmp} ;;
236   i845) echo " \n\n\n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;   i845) echo " \n \\Z2Intel i845 Device erkannt.\\Zn \\" >> ${hwtmp} ;;
237   *) echo " \n\n\n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;   *) echo " \n \\ZnStandard Device erkannt.\\Zn \\" >> ${hwtmp} ;;
238   esac   esac
239   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
240   then   then
241   echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}   echo " \n \\ZnFormfactor Laptop, Powersave Modus 'ondemand' wird aktiviert.\\Zn \\" >> ${hwtmp}
242   fi   fi
243     if [[ ${FLASHDISK} = 1 ]]
244     then
245     echo " \n \\ZnFlash Speicher erkannt, F2FS wird als Dateisystem bei der\\Zn \\" >> ${hwtmp}
246     echo " \n \\Znautomatischen Installation benutzt.\\Zn \\" >> ${hwtmp}
247     fi
248    
249   echo " \" 14 70" >> ${hwtmp}   echo " \" 14 70" >> ${hwtmp}
250   chmod a+x ${hwtmp}   chmod a+x ${hwtmp}
# Line 230  dialog_hardware_detection() Line 257  dialog_hardware_detection()
257   fi   fi
258  }  }
259    
260  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions()
261  {  {
262   local i   local i
263    
264   if [[ -z ${installdevs} ]]   if [[ -z ${ALL_DISKS} ]]
265   then   then
266   dialog \   dialog \
267   --backtitle "${TITLE}" \   --backtitle "${TITLE}" \
# Line 250  dialog_setup_hdd_partitions_manuell() Line 277  dialog_setup_hdd_partitions_manuell()
277   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> /tmp/hddtmp.sh
278   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh   echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
279    
280   for i in ${installdevs}   for i in ${ALL_DISKS}
281   do   do
282   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh   echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
283   done   done
# Line 263  dialog_setup_hdd_partitions_manuell() Line 290  dialog_setup_hdd_partitions_manuell()
290   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
291   then   then
292   dialog_setup_hdd_info   dialog_setup_hdd_info
293   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  
294   fi   fi
295   fi   fi
296  }  }
# Line 386  dialog_install_meter() Line 336  dialog_install_meter()
336   return 0   return 0
337  }  }
338    
   
339  dialog_install_bootsector()  dialog_install_bootsector()
340  {  {
341   dialog \   dialog \
# Line 423  dialog_main() Line 372  dialog_main()
372   --no-cancel \   --no-cancel \
373   --ok-label "Weiter" \   --ok-label "Weiter" \
374   --stdout \   --stdout \
375   --menu "Konfiguration" 14 70 5 \   --menu "Konfiguration" 14 70 6 \
376   "1" "AutoSta_LX installieren" \   "1" "AutoSta_LX installieren" \
377   "2" "Uebersicht gefundener Laufwerke" \   "2" "Uebersicht gefundener Laufwerke" \
378   "3" "Beenden und neustarten" \   "3" "Beenden und neustarten" \
# Line 443  dialog_main() Line 392  dialog_main()
392  }  }
393    
394  #################################################  #################################################
395  # Install Komandos #  # Install Commands #
396  #################################################  #################################################
397  run_hardware_detection()  run_hardware_detection()
398  {  {
399   local hwinfo   local hwinfo
   
400   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"   hwinfo="$(hwinfo --bios --storage --pci --gfxcard --sys)"
401    
402   # check for special devices/clients:   # check for special devices/clients:
# Line 461  run_hardware_detection() Line 409  run_hardware_detection()
409   if [[ $(< ${i}) = 1 ]]   if [[ $(< ${i}) = 1 ]]
410   then   then
411   removable=1   removable=1
412     # we assume that all removable disks are flash disks
413     export FLASHDISK=1
414   fi   fi
415   done   done
416    
# Line 504  run_hardware_detection() Line 454  run_hardware_detection()
454   export GRUB2GFXPAYLOAD="keep"   export GRUB2GFXPAYLOAD="keep"
455   fi   fi
456    
457     # check for radeon gfxcards
458     if [[ ! -z $(echo "${hwinfo}" | grep -i radeon) ]]
459     then
460     # enable full kms support
461     export GRUB2GFXPAYLOAD="keep"
462     fi
463    
464     # requires nomsi to prevent massive IRQ error spam
465     # see: http://ubuntuforums.org/showthread.php?t=1234983
466     if [[ ! -z $(echo "${hwinfo}" | grep -i 'ASUS P5VD2-X') ]] ||
467     [[ ! -z $(echo "${hwinfo}" | grep -i 'VT8237') ]] ||
468     [[ ! -z $(echo "${hwinfo}" | grep -i 'VX700') ]]
469     then
470     export SPECIALDEVICE="P5VD2-X/VT8237/VX700"
471     export KERNELOPTS="${KERNELOPTS} pci=nomsi,noaer"
472     fi
473    
474   # check for special devices/clients:   # check for special devices/clients:
475   # check for laptops and activate cpufreq scaling   # check for laptops and activate cpufreq scaling
476   if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]   if [[ $(echo "${hwinfo}" | grep 'Formfactor:' | sed 's:.*Formfactor\:\ \"\(.*\)\":\1:') = laptop ]]
# Line 513  run_hardware_detection() Line 480  run_hardware_detection()
480   fi   fi
481  }  }
482    
483    run_hardware_detection_disks()
484    {
485     local bootdev
486    
487     # all disks but exclude ramdisks
488     export ALL_DISKS=$(get_hwinfo disk | sed '/\/dev\/ram[0-9].*/d')
489     # remove the boot device from ALL_DISKS if it was an usbstick
490     if [[ $(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f3) != iso9660 ]]
491     then
492     bootdev="$(grep '[[:space:]]/mnt/cdrom[[:space:]]' /proc/mounts | cut -d' ' -f1 | sed 's:[0-9]::g')"
493     export ALL_DISKS=$(echo "${ALL_DISKS}" | grep -v "${bootdev}")
494     fi
495     export ALL_CDROMS="$(get_hwinfo cdrom)"
496    }
497    
498  hdd_size_below_256mb()  hdd_size_below_256mb()
499  {  {
500   local hdd="$1"   local hdd="$1"
# Line 531  hdd_size_below_256mb() Line 513  hdd_size_below_256mb()
513   return "${retval}"   return "${retval}"
514  }  }
515    
516  setup_hdd_partitions_auto()  setup_hdd_partitions()
517  {  {
518   ROOTHDD="${HDD}1"   case "${INSTALL_METHOD}" in
519     auto)
520     if [[ ${FLASHDISK} = 1 ]]
521     then
522     BOOTHDD="${HDD}1"
523     SWAPHDD=""
524     ROOTHDD="${HDD}2"
525     else
526     BOOTHDD=""
527     SWAPHDD=""
528     ROOTHDD="${HDD}1"
529     fi
530     ;;
531    
532   # run this only if FDISKPARTITIONBELOW256MB is not already 1   normal)
533   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   BOOTHDD="${HDD}1"
534     SWAPHDD="${HDD}2"
535     ROOTHDD="${HDD}3"
536     ;;
537    
538     single)
539     BOOTHDD=""
540     SWAPHDD=""
541     ROOTHDD="${HDD}1"
542     ;;
543    
544     flash)
545     BOOTHDD="${HDD}1"
546     SWAPHDD=""
547     ROOTHDD="${HDD}2"
548     ;;
549     esac
550    
551     if [[ ${INSTALL_METHOD} = auto ]]
552   then   then
553   if hdd_size_below_256mb ${HDD}   # run this only if FDISKPARTITIONBELOW256MB is not already 1
554     if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
555   then   then
556   FDISKPARTIONBELOW256MB=1   if hdd_size_below_256mb ${HDD}
557   else   then
558   FDISKPARTIONBELOW256MB=0   FDISKPARTIONBELOW256MB=1
559     else
560     FDISKPARTIONBELOW256MB=0
561     fi
562   fi   fi
  fi  
563    
564   ## delete disk   ## delete disk
565   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die   dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
566    
567   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]   if [[ ${FLASHDISK} = 1 ]]
568   then   then
569   ## setup one bootable partition   if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
570   #1. n= new disk   then
571   #2. p= primary disk   ## setup one bootable partition
572   #3. 1= first partition   # 1. n= new disk
573   #4. 2= default sector start // small disk needs more space for grub2 mbr sector   # 2. p= primary disk
574   #5. ''= defaul sector end   # 3. 1= first partition
575   #6. a= bootable flag   # 4. 2= default sector start // small disk needs more space for grub2 mbr sector
576   #7. 1= boot flag for partition 1   # 5. ''= defaul sector end
577   #8. w= write/quit   # 6. a= bootable flag
578   fdisk ${HDD} &> /dev/null << EOF   # 7. 1= boot flag for partition 1
579     # 8. n= new disk
580     #10. p= primary disk
581     #11. 2= second partition
582     #12. ''= default sector start
583     #13. ''= defaul sector end
584     #14. w= write/quit
585     fdisk ${HDD} &> /dev/null << EOF
586  n  n
587  p  p
588  1  1
589  2  2
590    +50M
591  a  a
592  1  1
593    n
594    p
595    2
596    
597    
598  w  w
599  EOF  EOF
600   else   else
601   ## setup one bootable partition   ## setup one bootable partition
602   #1. n= new disk   # 1. n= new disk
603   #2. p= primary disk   # 2. p= primary disk
604   #3. 1= first partition   # 3. 1= first partition
605   #4. ''= default sector start   # 4. ''= default sector start
606   #5. ''= defaul sector end   # 5. ''= defaul sector end
607   #6. a= bootable flag   # 6. a= bootable flag
608   #7. 1= boot flag for partition 1   # 7. 1= boot flag for partition 1
609   #8. w= write/quit   # 8. n= new disk
610   fdisk ${HDD} &> /dev/null << EOF   #10. p= primary disk
611     #11. 2= second partition
612     #12. ''= default sector start
613     #13. ''= defaul sector end
614     #14. w= write/quit
615     fdisk ${HDD} &> /dev/null << EOF
616  n  n
617  p  p
618  1  1
619    
620    +50M
621  a  a
622  1  1
623    n
624    p
625    2
626    
627    
628  w  w
629  EOF  EOF
630   fi   fi
631  }   else
632     if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
633  setup_hdd_partitions_manuell()   then
634  {   ## setup one bootable partition
635   BOOTHDD="${HDD}1"   #1. n= new disk
636   SWAPHDD="${HDD}2"   #2. p= primary disk
637   ROOTHDD="${HDD}3"   #3. 1= first partition
638     #4. 2= default sector start // small disk needs more space for grub2 mbr sector
639     #5. ''= defaul sector end
640     #6. a= bootable flag
641     #7. 1= boot flag for partition 1
642     #8. w= write/quit
643     fdisk ${HDD} &> /dev/null << EOF
644    n
645    p
646    1
647    2
648    
649   ## hdds partitionieren manuell  a
650   cfdisk ${HDD} || die  1
651  }  w
652    EOF
653     else
654     ## setup one bootable partition
655     #1. n= new disk
656     #2. p= primary disk
657     #3. 1= first partition
658     #4. ''= default sector start
659     #5. ''= defaul sector end
660     #6. a= bootable flag
661     #7. 1= boot flag for partition 1
662     #8. w= write/quit
663     fdisk ${HDD} &> /dev/null << EOF
664    n
665    p
666    1
667    
 setup_hdd_partitions_manuell_flash()  
 {  
  ROOTHDD="${HDD}1"  
668    
669   ## hdds partitionieren manuell  a
670   cfdisk ${HDD} || die  1
671    w
672    EOF
673     fi
674     fi
675     else
676     ## hdds partitionieren manuell
677     cfdisk ${HDD} || die
678     fi
679  }  }
680    
681  setup_hdd_format()  setup_hdd_format()
682  {  {
683   mkswap ${SWAPHDD} || die   install -d /tmp
684   mke2fs -j -q ${BOOTHDD} || die   :> /tmp/format.log
  mke2fs -j -q ${ROOTHDD} || die  
 }  
685    
686  setup_hdd_format_flash()   if [[ -n ${SWAPHDD} ]]
687  {   then
688   mke2fs -j -q ${ROOTHDD} || die   mkswap ${SWAPHDD} || die
689     fi
690     if [[ -n ${BOOTHDD} ]]
691     then
692     mkfs.${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} &> /tmp/format.log || die
693     fi
694     if [[ -n ${ROOTHDD} ]]
695     then
696     mkfs.${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} &> /tmp/format.log || die
697     fi
698  }  }
699    
700  install_mount_rootfs()  install_mount_rootfs()
701  {  {
702   swapon ${SWAPHDD} || die   local opts
  mount ${ROOTHDD} ${INSTALLPATH} || die  
  install -d ${INSTALLPATH}/boot || die  
  mount ${BOOTHDD} ${INSTALLPATH}/boot || die  
  cd ${INSTALLPATH} || die  
 }  
703    
704  install_mount_rootfs_flash()   if [[ -n ${SWAPHDD} ]]
705  {   then
706   mount ${ROOTHDD} ${INSTALLPATH} || die   swapon ${SWAPHDD} || die
707   install -d ${INSTALLPATH}/boot || die   fi
708   cd ${INSTALLPATH} || die   if [[ -n ${ROOTHDD} ]]
709     then
710     mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
711     fi
712     if [[ -n ${BOOTHDD} ]]
713     then
714     install -d ${INSTALL_ROOT}/boot || die
715     mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
716     fi
717    
718     cd ${INSTALL_ROOT} || die
719  }  }
720    
721  install_system_image()  install_system_image()
722  {  {
723   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALL_ROOT}
724  }  }
725    
726  install_bootsector_chroot()  install_bootsector_chroot()
727  {  {
728   local my_roothdd   local my_roothdd
729   local grubconf=${INSTALLPATH}/boot/grub/grub.conf   local grubconf=${INSTALL_ROOT}/boot/grub/grub.conf
730   local grub2conf=/boot/grub/grub.cfg   local grub2conf=/boot/grub/grub.cfg
731     local CONFIG
732    
733   # check for grub2   # check for grub2
734   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]   if [[ -f ${INSTALL_ROOT}/sbin/grub-mkconfig ]]
735   then   then
736   # needed by grub-mkconfig on the first run   # needed by grub-mkconfig on the first run
737   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]   if [[ ! -f ${INSTALL_ROOT}/boot/grub/video.lst ]]
738   then   then
739   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
740   fi   fi
741    
742   # set kernelopts   # set kernelopts
743   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]   if [[ -f ${INSTALL_ROOT}/etc/conf.d/grub ]]
744   then   then
745   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
746   sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALLPATH}/etc/conf.d/grub || die   sed -i "s:^\(export GRUB_GFXPAYLOAD_LINUX=\).*:\1\"${GRUB2GFXPAYLOAD}\":" ${INSTALL_ROOT}/etc/conf.d/grub || die
747   else   else
748   echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die   CONFIG=${INSTALL_ROOT}/etc/conf.d/grub
749   echo "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\"" >>  ${INSTALLPATH}/etc/conf.d/grub || die   clearconfig
750     addconfig "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\""
751     addconfig "export GRUB_GFXPAYLOAD_LINUX=\"${GRUB2GFXPAYLOAD}\""
752   fi   fi
753   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die   CONFIG=${INSTALL_ROOT}/.installrc
754   echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   clearconfig
755   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die   addconfig 'grub-mkdevicemap'
756   echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die   addconfig "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null"
757     addconfig "grub-install --no-floppy ${HDD} &> /dev/null"
758     addconfig "exit 0"
759    
760   # grub-legacy   # grub-legacy
761   else   else
762   ### grubconf schreiben   ### grubconf schreiben
763   source ${INSTALLPATH}/boot/kernelversion   source ${INSTALL_ROOT}/boot/kernelversion
764    
765   #for alx only   #for alx only
766   if [ -e ${INSTALLPATH}/etc/alx_version ]   if [ -e ${INSTALL_ROOT}/etc/alx_version ]
767   then   then
768   OLD_ALXVER="${ALXVER}"   OLD_ALXVER="${ALXVER}"
769   source ${INSTALLPATH}/etc/alx_version   source ${INSTALL_ROOT}/etc/alx_version
770   KRNVER="ALX-${ALXVER}"   KRNVER="ALX-${ALXVER}"
771   ALXVER="${OLD_ALXVER}"   ALXVER="${OLD_ALXVER}"
772   fi   fi
# Line 699  install_bootsector_chroot() Line 783  install_bootsector_chroot()
783   my_roothdd="${ROOTHDD}"   my_roothdd="${ROOTHDD}"
784   fi   fi
785    
786   : > ${grubconf} || die   CONFIG="${grubconf}"
787   echo "default 0" >> ${grubconf} || die   clearconfig
788   echo "timeout 3" >> ${grubconf} || die   addconfig "default 0"
789     addconfig "timeout 3"
790   # using current root password   # using current root password
791   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)"
792     addconfig
793   echo  >> ${grubconf} || die   addconfig "# normal boot"
794   echo "# normal boot" >> ${grubconf} || die   addconfig "title ${KRNVER}"
795   echo "title ${KRNVER}" >> ${grubconf} || die   addconfig "root (hd0,0)"
796   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  
797   if is_initrd_supported   if is_initrd_supported
798   then   then
799   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
800   fi   fi
801     addconfig
802   echo >> ${grubconf} || die   addconfig "# admin boot"
803   echo "# admin boot" >> ${grubconf} || die   addconfig "title ${KRNVER} - Re-run hardware-detection"
804   echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die   addconfig "lock"
805   echo "lock"  >> ${grubconf} || die   addconfig "root (hd0,0)"
806   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  
807   if is_initrd_supported   if is_initrd_supported
808   then   then
809   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
810   fi   fi
811     addconfig
812   echo >> ${grubconf} || die   addconfig "title ${KRNVER} - Reset *all* local settings"
813   echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die   addconfig "lock"
814   echo "lock"  >> ${grubconf} || die   addconfig "root (hd0,0)"
815   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  
816   if is_initrd_supported   if is_initrd_supported
817   then   then
818   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die   addconfig "initrd /boot/${KRNINITRD}"
819   fi   fi
820    
821   # bootsector schreiben chrooted schreiben (lfs/magellan)   # write bootsector chrooted (lfs/magellan)
822   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   CONFIG=${INSTALL_ROOT}/.installrc
823  /usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null   clearconfig
824  root (hd0,0)   addconfig '/usr/sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null'
825  setup (hd0)   addconfig 'root (hd0,0)'
826  quit   addconfig 'setup (hd0)'
827  EOF   addconfig 'quit'
828  exit 0   addconfig 'EOF'
829  CHROOTEOF   addconfig 'exit 0'
830   fi   fi
831    
832   ## enters chroot   ## enter chroot
833   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  
834  }  }
835    
836  is_initrd_supported()  is_initrd_supported()
837  {  {
838   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
839   [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0   [[ -x ${INSTALL_ROOT}/sbin/mkinitrd ]] && return 0
840   return 1   return 1
841  }  }
842    
843  install_initrd_chroot()  install_initrd_chroot()
844  {  {
845     local CONFIG
846    
847   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
848   is_initrd_supported || return 0   is_initrd_supported || return 0
849    
850     FSMODS="${FORMAT_FILESYSTEM_BOOTHDD} ${FORMAT_FILESYSTEM_ROOTHDD}"
851   DISKMODS="sd_mod"   DISKMODS="sd_mod"
852   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
853   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"
# Line 792  install_initrd_chroot() Line 870  install_initrd_chroot()
870   fi   fi
871    
872   # install an appropriate uvesafb.conf   # install an appropriate uvesafb.conf
873   install -d ${INSTALLPATH}/etc/modprobe.d || die   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/uvesafb.conf
874   echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die   clearconfig
875     addconfig "options uvesafb mode_option=1024x768-32@60 scroll=ywrap"
876    
877   # install an appropriate viafb.conf   # install an appropriate viafb.conf
878   echo "options viafb viafb_mode=1024x768 viafb_refresh=60" > ${INSTALLPATH}/etc/modprobe.d/viafb.conf || die   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/viafb.conf
879     clearconfig
880     addconfig "options viafb viafb_mode=1024x768 viafb_refresh=60"
881    
882   # install an appropriate i810fb.conf   # install an appropriate i810fb.conf
883   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   CONFIG=${INSTALL_ROOT}/etc/modprobe.d/i810fb.conf
884     clearconfig
885   cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF   addconfig "options i810fb xres=1024 yres=768 bpp=16 mtrr=1 hsync1=30 hsync2=62 vsync1=30 vsync2=60"
886  echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\"" > /etc/conf.d/mkinitrd  
887  mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null   CONFIG=${INSTALL_ROOT}/.installrc
888  exit 0   clearconfig
889  CHROOTEOF   addconfig "echo \"MODULES=\\\"${FSMODS} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS} ${OTHERMODS}\\\"\" > /etc/conf.d/mkinitrd"
890     addconfig "mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null"
891   ## enters chroot   addconfig "exit 0"
892   mount -t proc proc ${INSTALLPATH}/proc   ## enter chroot
893   mount -t sysfs sysfs ${INSTALLPATH}/sys   enter_chroot_installrc
  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  
894  }  }
895    
896  is_uuid_supported()  is_uuid_supported()
897  {  {
898   if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]   # f2fs needs special treatments as the old busybox does not support this fs
899     # use the blkid from util-linux instead of busybox
900     if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
901   then   then
902   # only detect uuids if supported   if [[ -x $(type -P blkid) ]]
903   if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]   then
904     return 0
905     fi
906     else
907     if [[ -x $(type -P busybox.mkinitrd) ]]
908   then   then
909   return 0   # only detect uuids if supported
910     if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
911     then
912     return 0
913     fi
914   fi   fi
915   fi   fi
916    
# Line 837  get_uuid() Line 922  get_uuid()
922   local UUID   local UUID
923   local SEC_TYPE   local SEC_TYPE
924   local TYPE   local TYPE
925     local blkidcmd
926    
927   local dev="$1"   local dev="$1"
928   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && die "no dev given"
# Line 846  get_uuid() Line 932  get_uuid()
932   then   then
933   eval "${dev}"   eval "${dev}"
934   else   else
935   eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')   # f2fs needs special treatments as the old busybox does not support this fs
936     # use the blkid from util-linux instead of busybox
937     if [[ ${FORMAT_FILESYSTEM} = f2fs ]]
938     then
939     blkidcmd="blkid"
940     else
941     blkidcmd="busybox.mkinitrd blkid"
942     fi
943     eval $(${blkidcmd} ${dev} | grep "${dev}:" | sed 's/.*:\ //')
944   fi   fi
945   echo "${UUID}"   echo "${UUID}"
946  }  }
947    
948  install_system_settings()  install_system_settings()
949  {  {
950   # schreibe fstab   local CONFIG
951   if is_uuid_supported   local fstype
952    
953     # write fstab
954     CONFIG=${INSTALL_ROOT}/etc/fstab
955     clearconfig
956    
957     if [[ -n ${BOOTHDD} ]]
958   then   then
959   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
960   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
961   else   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
962   echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   else
963   echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
964     fi
965   fi   fi
966    
967     if [[ -n ${ROOTHDD} ]]
968     then
969     if is_uuid_supported
970     then
971     addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
972     else
973     addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
974     fi
975     fi
976    
977   # 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
978   #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"
979   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
980   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   addconfig -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0"
981    
982   # install network config skeleton   # install network config skeleton
983   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
984    
985   # intel framebufer quirk   # intel framebufer quirk
986   if [[ -e /proc/fb ]]   if [[ -e /proc/fb ]]
# Line 878  install_system_settings() Line 990  install_system_settings()
990   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')   fbdev=$(grep 'inteldrmfb' /proc/fb | sed 's:\([0-9]\).*:\1:')
991   if [[ ${fbdev} != 0 ]]   if [[ ${fbdev} != 0 ]]
992   then   then
993   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALLPATH}/etc/splash/splash.conf || die   sed -i "s:^\(SPLASH_DEV=\).*:\1\"/dev/fb${fbdev}\":" ${INSTALL_ROOT}/etc/splash/splash.conf || die
994   fi   fi
995   fi   fi
996   fi   fi
997  }  }
998    
 install_system_settings_flash()  
 {  
  # schreibe fstab  
  if is_uuid_supported  
  then  
  echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die  
  else  
  echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die  
  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  
 }  
   
999  install_umount_rootfs()  install_umount_rootfs()
1000  {  {
1001   cd /   cd /
1002   umount ${INSTALLPATH}/boot || die   if [[ -n ${BOOTHDD} ]]
1003   umount ${INSTALLPATH} || die   then
1004   swapoff ${SWAPHDD} || die   umount ${INSTALL_ROOT}/boot || die
1005  }   fi
1006     if [[ -n ${ROOTHDD} ]]
1007  install_umount_rootfs_flash()   then
1008  {   umount ${INSTALL_ROOT} || die
1009   cd /   fi
1010   umount ${INSTALLPATH} || die   if [[ -n ${SWAPHDD} ]]
1011     then
1012     swapoff ${SWAPHDD} || die
1013     fi
1014  }  }
1015    
1016  install_do_reboot()  install_do_reboot()
# Line 917  install_do_reboot() Line 1019  install_do_reboot()
1019  }  }
1020    
1021  #################################################  #################################################
1022  #     Install Ablauf Scripte #  #     Install Main Scripts #
1023  #################################################  #################################################
1024    
1025  run_install_normal()  run_install()
1026  {  {
1027     local method="$1"
1028    
1029     # setup install environment
1030     export KERNELOPTS="${DEFAULT_KERNELOPTS}"
1031     export GRUBLEGACYOPTS="${GRUBLEGACYOPTS}"
1032     export GRUB2OPTS="${GRUB2OPTS}"
1033     export GRUB2GFXPAYLOAD="${DEFAULT_GRUB2GFXPAYLOAD}"
1034     export FORMFACTOR="${DEFAULT_FORMFACTOR}"
1035     export FORMAT_FILESYSTEM="${DEFAULT_FORMAT_FILESYSTEM}"
1036    
1037     # run hardware detections first to get the disktypes detected
1038   dialog_hardware_detection   dialog_hardware_detection
1039    
1040   dialog_setup_hdd_partitions_manuell   case "${method}" in
1041     auto)
1042     if [[ ${FLASHDISK} = 1 ]]
1043     then
1044     export FORMAT_FILESYSTEM="f2fs"
1045     export FORMAT_FILESYSTEM_BOOTHDD="ext2"
1046     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
1047     else
1048     export FORMAT_FILESYSTEM_BOOTHDD=""
1049     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
1050     fi
1051     export INSTALL_METHOD="${method}"
1052     ;;
1053     normal)
1054     export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
1055     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
1056     export INSTALL_METHOD="${method}"
1057     ;;
1058     single)
1059     export FORMAT_FILESYSTEM_BOOTHDD=""
1060     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
1061     export INSTALL_METHOD="${method}"
1062     ;;
1063     flash)
1064     export FORMAT_FILESYSTEM="f2fs"
1065     export FORMAT_FILESYSTEM_BOOTHDD="ext2"
1066     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
1067     export INSTALL_METHOD="${method}"
1068     ;;
1069     *)
1070     die "Unknown install method '${method}', aborting."
1071     ;;
1072     esac
1073    
1074     dialog_setup_hdd_partitions
1075   dialog_setup_hdd_format   dialog_setup_hdd_format
1076   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
1077   install_mount_rootfs   install_mount_rootfs
# Line 942  run_install_normal() Line 1089  run_install_normal()
1089   dialog_install_successful   dialog_install_successful
1090  }  }
1091    
1092  run_install_flash()  # set some proper traps
1093  {  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  
 }  
1094    
1095  dialog_main  dialog_main
1096    

Legend:
Removed from v.6770  
changed lines
  Added in v.6959