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

alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh revision 1180 by niro, Wed Aug 5 18:12:25 2009 UTC alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in revision 3199 by niro, Wed Sep 14 11:11:55 2011 UTC
# Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ / Line 21  cdromdev="$(echo ${cdromdev} | sed 's/ /
21  ########################################  ########################################
22    
23  ### System/Config Version  ### System/Config Version
24  VERSION="0.3.3"  VERSION="%VERSIONTAG%"
25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
26    
27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
# Line 31  INSTALLPATH="/mnt/magellan" Line 31  INSTALLPATH="/mnt/magellan"
31  CURRENTLINE=0  CURRENTLINE=0
32  #TOTALLINES=11072 # -> now in images.conf  #TOTALLINES=11072 # -> now in images.conf
33    
34    # standard kernel opts
35    KERNELOPTS="quiet video=1024x768"
36    
37    # grub options
38    GRUBLEGACYOPTS=""
39    GRUB2OPTS=""
40    
41    # fdisk options
42    FDISKPARTIONBELOW256MB=0
43    
44    # default specialdevices
45    SPECIALDEVICE=""
46    
47    # target filesystem
48    FORMAT_FILESYSTEM="ext4"
49    
50  #################################################  #################################################
51  #  DIALOG BOXEN #  #  DIALOG BOXEN #
# Line 92  dialog_setup_hdd_info_flash() Line 107  dialog_setup_hdd_info_flash()
107   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
108  }  }
109    
110    dialog_setup_hdd_info_auto()
111    {
112     local SHDD="$(echo $HDD | sed 's/\/dev\///')"
113    
114     dialog \
115     --colors \
116     --title "[ Festplatten Partitionierung ]" \
117     --backtitle "${TITLE}" \
118     --ok-label "Weiter" \
119     --msgbox "\nAchtung!\n\
120     Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
121    }
122    
123  dialog_setup_system_menu()  dialog_setup_system_menu()
124  {  {
125   local i   local i
# Line 102  dialog_setup_system_menu() Line 130  dialog_setup_system_menu()
130   --cancel-label "Abbrechen" \   --cancel-label "Abbrechen" \
131   --ok-label "Weiter" \   --ok-label "Weiter" \
132   --stdout \   --stdout \
133     --colors \
134   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
135   "1" "Normale IDE-Disk" \   "1" "Automatisches Setup (Empfohlen)" \
136   "2" "Flash-Speicher")   "" "" \
137     "" "\Z1Experten Modi:\Zn" \
138     "2" "Normale IDE-Disk (Manuell)" \
139     "3" "Flash-Speicher (Manuell)")
140   RES=$?   RES=$?
141   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
142   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
143   then   then
144   case "${i}" in   case "${i}" in
145           "1") run_install_normal ;;   "1") run_install_auto ;;
146   "2") run_install_flash ;;           "2") run_install_normal ;;
147     "3") run_install_flash ;;
148     "") dialog_setup_system_menu;;
149   esac   esac
150   fi   fi
151  }  }
152    
153  dialog_setup_hdd_found_manuell()  dialog_hardware_detection()
154  {  {
155   local i   local i
156     local hwtmp
157    
158     if [ -x $(which mktemp &> /dev/null) ]
159     then
160     hwtmp="$(mktemp)"
161     else
162     hwtmp="/tmp/hwtmp.sh"
163     fi
164    
165   [[ ! -z ${installdevs} ]] && installdevs=""   [[ ! -z ${installdevs} ]] && installdevs=""
166    
167   echo "dialog \\"  > /tmp/hddtmp.sh   echo "dialog \\"  > ${hwtmp}
168   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
169   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
170   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> ${hwtmp}
171   echo "--colors \\" >> /tmp/hddtmp.sh   echo "--colors \\" >> ${hwtmp}
172   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> /tmp/hddtmp.sh   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
173   echo " Festplatten:\n \\" >> /tmp/hddtmp.sh   echo " Festplatten:\n \\" >> ${hwtmp}
174    
175   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${scsidisks} ]]
176   then   then
# Line 136  dialog_setup_hdd_found_manuell() Line 178  dialog_setup_hdd_found_manuell()
178   do   do
179   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
180   then   then
181   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
182   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
183   fi   fi
184   done   done
# Line 148  dialog_setup_hdd_found_manuell() Line 190  dialog_setup_hdd_found_manuell()
190   do   do
191   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
192   then   then
193   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
194   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
195   fi   fi
196   done   done
# Line 156  dialog_setup_hdd_found_manuell() Line 198  dialog_setup_hdd_found_manuell()
198    
199   if [[ ! -z ${cdromdev} ]]   if [[ ! -z ${cdromdev} ]]
200   then   then
201   echo " \n \\" >> /tmp/hddtmp.sh   echo " \n \\" >> ${hwtmp}
202   echo " \\Z7andere Laufwerke:\n \\" >> /tmp/hddtmp.sh   echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
203   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
204   fi   fi
205   echo " \" 13 70" >> /tmp/hddtmp.sh  
206   chmod a+x /tmp/hddtmp.sh   # other devices
207   /tmp/hddtmp.sh   run_hardware_detection
208     case "${SPECIALDEVICE}" in
209     zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
210     "rangee+256mb")  echo " \n\n\n \\Z2Rangee Device mit Flashdisk (=< 256MB) erkannt!\\Zn \\" >> ${hwtmp} ;;
211     rangee) echo " \n\n\n \\Z2Rangee Device erkannt!\\Zn \\" >> ${hwtmp} ;;
212     *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
213     esac
214    
215     echo " \" 13 70" >> ${hwtmp}
216     chmod a+x ${hwtmp}
217     ${hwtmp}
218    
219     # remove tmp file
220     if [[ -f ${hwtmp} ]]
221     then
222     rm ${hwtmp}
223     fi
224  }  }
225    
226  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manuell()
# Line 241  dialog_setup_hdd_partitions_manuell_flas Line 299  dialog_setup_hdd_partitions_manuell_flas
299   fi   fi
300  }  }
301    
302    dialog_setup_hdd_partitions_auto()
303    {
304     local i
305    
306     if [[ -z ${installdevs} ]]
307     then
308     dialog \
309     --backtitle "${TITLE}" \
310     --ok-label "Beenden" \
311     --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
312     exit 1
313     else
314    
315     echo "dialog \\" > /tmp/hddtmp.sh
316     echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
317     echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
318     echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
319     echo "--stdout \\" >> /tmp/hddtmp.sh
320     echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
321    
322     for i in ${installdevs}
323     do
324     echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
325     done
326     echo -e "\n" >> /tmp/hddtmp.sh
327    
328     chmod a+x /tmp/hddtmp.sh
329     HDD="$(/tmp/hddtmp.sh)"
330     RES=$?
331     [[ ${RES} -eq 1 ]] && return 1
332     if [[ ${RES} -eq 0 ]]
333     then
334     dialog_setup_hdd_info_auto
335     dialog_setup_hdd_create_partitions
336     setup_hdd_partitions_auto
337     fi
338     fi
339    }
340    
341    dialog_setup_hdd_create_partitions()
342    {
343     dialog \
344     --backtitle "${TITLE}" \
345     --infobox "Erstelle Disk Partitionen ..." 3 70
346    }
347    
348  dialog_setup_hdd_format()  dialog_setup_hdd_format()
349  {  {
350   dialog \   dialog \
# Line 323  dialog_main() Line 427  dialog_main()
427   then   then
428   case ${METHOD} in   case ${METHOD} in
429           "1") dialog_setup_system_menu ;;           "1") dialog_setup_system_menu ;;
430   "2") dialog_setup_hdd_found_manuell ;;   "2") dialog_hardware_detection ;;
431   "3") install_do_reboot ;;   "3") install_do_reboot ;;
432   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
433   esac   esac
# Line 334  dialog_main() Line 438  dialog_main()
438  #################################################  #################################################
439  # Install Komandos #  # Install Komandos #
440  #################################################  #################################################
441    run_hardware_detection()
442    {
443     local hwinfo
444    
445     hwinfo="$(hwinfo --bios --storage)"
446    
447     # check for special devices/clients:
448     # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
449     local removable=0
450     if [[ ! -z $(echo "${hwinfo}" | grep -i zotac) ]]
451     then
452     for i in /sys/block/[hs]d*/removable
453     do
454     if [[ $(< ${i}) = 1 ]]
455     then
456     removable=1
457     fi
458     done
459    
460     # only add this for grub legacy, grub2 detect these settings on its own
461     export GRUBLEGACYOPTS="rootdelay=8"
462     export SPECIALDEVICE="zotac"
463     fi
464    
465     # check for special devices/clients:
466     # if a rangee and disk ist smaller then 256mb move partion one block further ahead
467     if [[ ! -z $(echo "${hwinfo}" | grep -i CLE266) ]]
468     then
469     # for a rangee always define partion startblock +1
470     export FDISKPARTIONBELOW256MB="1"
471     export SPECIALDEVICE="rangee"
472     export GRUBLEGACYOPTS=""
473     fi
474    }
475    
476    hdd_size_below_256mb()
477    {
478     local hdd="$1"
479     local size
480     local retval
481     [[ -z ${hdd} ]] && die "Error: get_hdd_size() no \$hdd given!"
482    
483     size=$(fdisk -l ${hdd} | grep "Disk.*${hdd}" | sed 's:.*,\ \(.*\)\ byte.*:\1:')
484     if [[ ${size} -le 257000000 ]]
485     then
486     retval="0"
487     else
488     retval="1"
489     fi
490    
491     return "${retval}"
492    }
493    
494    setup_hdd_partitions_auto()
495    {
496     ROOTHDD="${HDD}1"
497    
498     # run this only if FDISKPARTITIONBELOW256MB is not already 1
499     if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
500     then
501     if hdd_size_below_256mb ${HDD}
502     then
503     FDISKPARTIONBELOW256MB=1
504     else
505     FDISKPARTIONBELOW256MB=0
506     fi
507     fi
508    
509     ## delete disk
510     dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
511    
512     if [[ ${FDISKPARTIONBELOW256MB} = 1 ]]
513     then
514     ## setup one bootable partition
515     #1. n= new disk
516     #2. p= primary disk
517     #3. 1= first partition
518     #4. 2= default sector start // small disk needs more space for grub2 mbr sector
519     #5. ''= defaul sector end
520     #6. a= bootable flag
521     #7. 1= boot flag for partition 1
522     #8. w= write/quit
523     fdisk ${HDD} &> /dev/null << EOF
524    n
525    p
526    1
527    2
528    
529    a
530    1
531    w
532    EOF
533     else
534     ## setup one bootable partition
535     #1. n= new disk
536     #2. p= primary disk
537     #3. 1= first partition
538     #4. ''= default sector start
539     #5. ''= defaul sector end
540     #6. a= bootable flag
541     #7. 1= boot flag for partition 1
542     #8. w= write/quit
543     fdisk ${HDD} &> /dev/null << EOF
544    n
545    p
546    1
547    
548    
549    a
550    1
551    w
552    EOF
553     fi
554    }
555    
556  setup_hdd_partitions_manuell()  setup_hdd_partitions_manuell()
557  {  {
558   BOOTHDD="${HDD}1"   BOOTHDD="${HDD}1"
# Line 387  install_system_image() Line 606  install_system_image()
606    
607  install_bootsector_chroot()  install_bootsector_chroot()
608  {  {
609   ### grubconf schreiben   local my_roothdd
610   source ${INSTALLPATH}/boot/kernelversion   local grubconf=${INSTALLPATH}/boot/grub/grub.conf
611     local grub2conf=/boot/grub/grub.cfg
612    
613   #for alx only   # check for grub2
614   if [ -e ${INSTALLPATH}/etc/alx_version ]   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]
615   then   then
616   OLD_ALXVER="${ALXVER}"   # needed by grub-mkconfig on the first run
617   source ${INSTALLPATH}/etc/alx_version   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]
618   KRNVER="ALX-${ALXVER}"   then
619   ALXVER="${OLD_ALXVER}"   install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die
620   fi   fi
621    
622   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"   # set kernelopts
623   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
624     then
625     sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
626     else
627     echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
628     fi
629     echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
630     echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
631     echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
632     echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die
633    
634   local grubconf=${INSTALLPATH}/boot/grub/grub.conf   # grub-legacy
635   : > ${grubconf} || die   else
636   echo "default 0" >> ${grubconf} || die   ### grubconf schreiben
637   echo "timeout 3" >> ${grubconf} || die   source ${INSTALLPATH}/boot/kernelversion
  # using current root password  
  echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die  
   
  echo  >> ${grubconf} || die  
  echo "# normal boot" >> ${grubconf} || die  
  echo "title ${KRNVER}" >> ${grubconf} || die  
  echo "root (hd0,0)" >> ${grubconf} || die  
  echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${grubconf} || die  
  echo "initrd /boot/initrd" >> ${grubconf} || die  
   
  echo >> ${grubconf} || die  
  echo "# admin boot" >> ${grubconf} || die  
  echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die  
  echo "lock"  >> ${grubconf} || die  
  echo "root (hd0,0)" >> ${grubconf} || die  
  echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet hardware-auto-detection" >> ${grubconf} || die  
  echo "initrd /boot/initrd" >> ${grubconf} || die  
   
  echo >> ${grubconf} || die  
  echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die  
  echo "lock"  >> ${grubconf} || die  
  echo "root (hd0,0)" >> ${grubconf} || die  
  echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet alx-reset-settings" >> ${grubconf} || die  
  echo "initrd /boot/initrd" >> ${grubconf} || die  
638    
639   # bootsector schreiben chrooted schreiben (lfs/magellan)   #for alx only
640   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   if [ -e ${INSTALLPATH}/etc/alx_version ]
641     then
642     OLD_ALXVER="${ALXVER}"
643     source ${INSTALLPATH}/etc/alx_version
644     KRNVER="ALX-${ALXVER}"
645     ALXVER="${OLD_ALXVER}"
646     fi
647    
648     [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
649     [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
650     [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
651    
652     # uuid support
653     if is_uuid_supported
654     then
655     my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
656     else
657     my_roothdd="${ROOTHDD}"
658     fi
659    
660     : > ${grubconf} || die
661     echo "default 0" >> ${grubconf} || die
662     echo "timeout 3" >> ${grubconf} || die
663     # using current root password
664     echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
665    
666     echo  >> ${grubconf} || die
667     echo "# normal boot" >> ${grubconf} || die
668     echo "title ${KRNVER}" >> ${grubconf} || die
669     echo "root (hd0,0)" >> ${grubconf} || die
670     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
671     if is_initrd_supported
672     then
673     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
674     fi
675    
676     echo >> ${grubconf} || die
677     echo "# admin boot" >> ${grubconf} || die
678     echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
679     echo "lock"  >> ${grubconf} || die
680     echo "root (hd0,0)" >> ${grubconf} || die
681     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
682     if is_initrd_supported
683     then
684     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
685     fi
686    
687     echo >> ${grubconf} || die
688     echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
689     echo "lock"  >> ${grubconf} || die
690     echo "root (hd0,0)" >> ${grubconf} || die
691     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
692     if is_initrd_supported
693     then
694     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
695     fi
696    
697     # bootsector schreiben chrooted schreiben (lfs/magellan)
698     cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
699  /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
700  root (hd0,0)  root (hd0,0)
701  setup (hd0)  setup (hd0)
# Line 440  quit Line 703  quit
703  EOF  EOF
704  exit 0  exit 0
705  CHROOTEOF  CHROOTEOF
706     fi
707    
708   ## enters chroot   ## enters chroot
709   mount -t proc proc ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
710   mount -t sysfs sysfs ${INSTALLPATH}/sys   mount -t sysfs sysfs ${INSTALLPATH}/sys
711   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
712   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
713   umount ${INSTALLPATH}/proc   umount ${INSTALLPATH}/proc
714   umount ${INSTALLPATH}/sys   umount ${INSTALLPATH}/sys
715   umount ${INSTALLPATH}/dev   umount ${INSTALLPATH}/dev
716   rm ${INSTALLPATH}/root/.bashrc   rm ${INSTALLPATH}/root/.installrc
717  }  }
718    
719  install_mkinitrd_chroot()  is_initrd_supported()
720  {  {
721   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   # only generate initrds if the cmd exists
722  echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx sd_mod ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via sata_via sata_sis sata_nv\"" > /etc/conf.d/mkinitrd   [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
723     return 1
724    }
725    
726    install_initrd_chroot()
727    {
728     # only generate initrds if the cmd exists
729     is_initrd_supported || return 0
730    
731     DISKMODS="sd_mod"
732     OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
733     PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
734     SATAMODS="sata_via sata_sis sata_nv"
735     DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
736     FBMODS="uvesafb"
737    
738     # install an appropriate uvesafb.conf
739     install -d ${INSTALLPATH}/etc/modprobe.d || die
740     echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
741    
742     cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
743    echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
744  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
745  exit 0  exit 0
746  CHROOTEOF  CHROOTEOF
# Line 464  CHROOTEOF Line 749  CHROOTEOF
749   mount -t proc proc ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
750   mount -t sysfs sysfs ${INSTALLPATH}/sys   mount -t sysfs sysfs ${INSTALLPATH}/sys
751   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
752   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
753   umount ${INSTALLPATH}/proc   umount ${INSTALLPATH}/proc
754   umount ${INSTALLPATH}/sys   umount ${INSTALLPATH}/sys
755   umount ${INSTALLPATH}/dev   umount ${INSTALLPATH}/dev
756   rm ${INSTALLPATH}/root/.bashrc   rm ${INSTALLPATH}/root/.installrc
757  }  }
758    
759  get_blkid()  is_uuid_supported()
760    {
761     if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
762     then
763     # only detect uuids if supported
764     if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
765     then
766     return 0
767     fi
768     fi
769    
770     return 1
771    }
772    
773    get_uuid()
774  {  {
775   local UUID   local UUID
776   local SEC_TYPE   local SEC_TYPE
777   local TYPE   local TYPE
778    
779   local dev="$1"   local dev="$1"
780   [[ -z ${dev} ]] && die "no dev given"   [[ -z ${dev} ]] && die "no dev given"
781    
782   eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')   # check if given device is already an UUID
783   echo ${UUID}   if [[ ${dev/UUID=/}x != ${dev}x ]]
784     then
785     eval "${dev}"
786     else
787     eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
788     fi
789     echo "${UUID}"
790  }  }
791    
792  install_system_settings()  install_system_settings()
793  {  {
794   # schreibe fstab   # schreibe fstab
795   echo -e "$(get_blkid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
796   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
797   echo -e "$(get_blkid ${SWAPHDD})\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
798     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
799     else
800     echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
801     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
802     fi
803     # not needed busybox loads all with swapon -a, even if not mentioned in fstab
804     #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
805   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
806   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
807    
# Line 500  install_system_settings() Line 812  install_system_settings()
812  install_system_settings_flash()  install_system_settings_flash()
813  {  {
814   # schreibe fstab   # schreibe fstab
815   echo -e "$(get_blkid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
816     then
817     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
818     else
819     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
820     fi
821   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
822   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
823  }  }
# Line 530  install_do_reboot() Line 847  install_do_reboot()
847    
848  run_install_normal()  run_install_normal()
849  {  {
850   dialog_setup_hdd_found_manuell   dialog_hardware_detection
851    
852   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manuell
853   dialog_setup_hdd_format   dialog_setup_hdd_format
# Line 538  run_install_normal() Line 855  run_install_normal()
855   install_mount_rootfs   install_mount_rootfs
856   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
857    
  dialog_install_bootsector  
  install_bootsector_chroot  
   
858   dialog_install_settings   dialog_install_settings
859   sleep 1   sleep 1
860   install_system_settings   install_system_settings
861   install_mkinitrd_chroot   install_initrd_chroot
862    
863     dialog_install_bootsector
864     install_bootsector_chroot
865    
866   install_umount_rootfs   install_umount_rootfs
867   dialog_install_successful   dialog_install_successful
868  }  }
869    
870  run_install_flash()  run_install_flash()
871  {  {
872   dialog_setup_hdd_found_manuell   dialog_hardware_detection
873    
874   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_flash
875   dialog_setup_hdd_format   dialog_setup_hdd_format
# Line 559  run_install_flash() Line 877  run_install_flash()
877   install_mount_rootfs_flash   install_mount_rootfs_flash
878   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
879    
880     dialog_install_settings
881     sleep 1
882     install_system_settings_flash
883     install_initrd_chroot
884    
885   dialog_install_bootsector   dialog_install_bootsector
886   install_bootsector_chroot   install_bootsector_chroot
887    
888     install_umount_rootfs_flash
889     dialog_install_successful
890    }
891    
892    run_install_auto()
893    {
894     dialog_hardware_detection
895    
896     dialog_setup_hdd_partitions_auto
897     dialog_setup_hdd_format
898     setup_hdd_format_flash > /dev/null
899     install_mount_rootfs_flash
900     (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
901    
902   dialog_install_settings   dialog_install_settings
903   sleep 1   sleep 1
904   install_system_settings_flash   install_system_settings_flash
905   install_mkinitrd_chroot   install_initrd_chroot
906    
907     dialog_install_bootsector
908     install_bootsector_chroot
909    
910   install_umount_rootfs_flash   install_umount_rootfs_flash
911   dialog_install_successful   dialog_install_successful
912  }  }

Legend:
Removed from v.1180  
changed lines
  Added in v.3199