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 523 by niro, Fri Jun 27 22:48:55 2008 UTC alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in revision 2736 by niro, Thu Aug 11 14:58:15 2011 UTC
# Line 1  Line 1 
1  #!/bin/sh  #!/bin/sh
2  #  #
3  # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.9 2008-06-27 22:48:55 niro Exp $  # $Header: /home/cvsd/alx-cvs/alx-src/alxinstall-ng/bin/alxinstall-ng.sh,v 1.15 2008-06-28 00:37:45 niro Exp $
4  #  #
5  # AutoSta_LX Installation Script  # AutoSta_LX Installation Script
6  #  #
# Line 17  source /mnt/cdrom/system/images.conf Line 17  source /mnt/cdrom/system/images.conf
17  #Includes  #Includes
18  source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null  source /usr/lib/alxinstall-ng/functions/findhdd.sh > /dev/null
19  ### bugfix ###############################  ### bugfix ###############################
20  cdromdev="`echo $cdromdev|sed -e 's/ //'`"  cdromdev="$(echo ${cdromdev} | sed 's/ //')"
21  ########################################  ########################################
22    
23  ### System/Config Version  ### System/Config Version
24  VERSION="0.3"  VERSION="%VERSIONTAG%"
25  TITLE="alxinstall-ng - ${VERSION}"  TITLE="alxinstall-ng - ${VERSION}"
26    
 #CONFIGS_TEMPLATE="/opt/alx-config/configs"  
   
27  CDPATH="/mnt/cdrom"  CDPATH="/mnt/cdrom"
28  INSTALLPATH="/mnt/magellan"  INSTALLPATH="/mnt/magellan"
29    
# Line 33  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    # default specialdevices
42    SPECIALDEVICE=""
43    
44    # target filesystem
45    FORMAT_FILESYSTEM="ext4"
46    
47  #################################################  #################################################
48  #  DIALOG BOXEN #  #  DIALOG BOXEN #
# Line 94  dialog_setup_hdd_info_flash() Line 104  dialog_setup_hdd_info_flash()
104   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
105  }  }
106    
107    dialog_setup_hdd_info_auto()
108    {
109     local SHDD="$(echo $HDD | sed 's/\/dev\///')"
110    
111     dialog \
112     --colors \
113     --title "[ Festplatten Partitionierung ]" \
114     --backtitle "${TITLE}" \
115     --ok-label "Weiter" \
116     --msgbox "\nAchtung!\n\
117     Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
118    }
119    
120  dialog_setup_system_menu()  dialog_setup_system_menu()
121  {  {
122   local i   local i
# Line 104  dialog_setup_system_menu() Line 127  dialog_setup_system_menu()
127   --cancel-label "Abbrechen" \   --cancel-label "Abbrechen" \
128   --ok-label "Weiter" \   --ok-label "Weiter" \
129   --stdout \   --stdout \
130     --colors \
131   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
132   "1" "Normale IDE-Disk" \   "1" "Automatisches Setup (Empfohlen)" \
133   "2" "Flash-Speicher")   "" "" \
134     "" "\Z1Experten Modi:\Zn" \
135     "2" "Normale IDE-Disk (Manuell)" \
136     "3" "Flash-Speicher (Manuell)")
137   RES=$?   RES=$?
138   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
139   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
140   then   then
141   case "${i}" in   case "${i}" in
142           "1") run_install_normal ;;   "1") run_install_auto ;;
143   "2") run_install_flash ;;           "2") run_install_normal ;;
144     "3") run_install_flash ;;
145     "") dialog_setup_system_menu;;
146   esac   esac
147   fi   fi
148  }  }
149    
150  dialog_setup_hdd_found_manuell()  dialog_hardware_detection()
151  {  {
152   local i   local i
153     local hwtmp
154    
155     if [ -x $(which mktemp &> /dev/null) ]
156     then
157     hwtmp="$(mktemp)"
158     else
159     hwtmp="/tmp/hwtmp.sh"
160     fi
161    
162   [[ ! -z ${installdevs} ]] && installdevs=""   [[ ! -z ${installdevs} ]] && installdevs=""
163    
164   echo "dialog \\"  > /tmp/hddtmp.sh   echo "dialog \\"  > ${hwtmp}
165   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
166   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
167   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> ${hwtmp}
168   echo "--colors \\" >> /tmp/hddtmp.sh   echo "--colors \\" >> ${hwtmp}
169   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> /tmp/hddtmp.sh   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
170   echo " Festplatten:\n \\" >> /tmp/hddtmp.sh   echo " Festplatten:\n \\" >> ${hwtmp}
171    
172   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${scsidisks} ]]
173   then   then
# Line 138  dialog_setup_hdd_found_manuell() Line 175  dialog_setup_hdd_found_manuell()
175   do   do
176   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
177   then   then
178   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
179   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
180   fi   fi
181   done   done
# Line 150  dialog_setup_hdd_found_manuell() Line 187  dialog_setup_hdd_found_manuell()
187   do   do
188   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
189   then   then
190   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
191   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
192   fi   fi
193   done   done
# Line 158  dialog_setup_hdd_found_manuell() Line 195  dialog_setup_hdd_found_manuell()
195    
196   if [[ ! -z ${cdromdev} ]]   if [[ ! -z ${cdromdev} ]]
197   then   then
198   echo " \n \\" >> /tmp/hddtmp.sh   echo " \n \\" >> ${hwtmp}
199   echo " \\Z7andere Laufwerke:\n \\" >> /tmp/hddtmp.sh   echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
200   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
201   fi   fi
202   echo " \" 13 70" >> /tmp/hddtmp.sh  
203   chmod a+x /tmp/hddtmp.sh   # other devices
204   /tmp/hddtmp.sh   run_hardware_detection
205     case "${SPECIALDEVICE}" in
206     zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
207     *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
208     esac
209    
210     echo " \" 13 70" >> ${hwtmp}
211     chmod a+x ${hwtmp}
212     ${hwtmp}
213    
214     # remove tmp file
215     if [[ -f ${hwtmp} ]]
216     then
217     rm ${hwtmp}
218     fi
219  }  }
220    
221  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manuell()
# Line 243  dialog_setup_hdd_partitions_manuell_flas Line 294  dialog_setup_hdd_partitions_manuell_flas
294   fi   fi
295  }  }
296    
297    dialog_setup_hdd_partitions_auto()
298    {
299     local i
300    
301     if [[ -z ${installdevs} ]]
302     then
303     dialog \
304     --backtitle "${TITLE}" \
305     --ok-label "Beenden" \
306     --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
307     exit 1
308     else
309    
310     echo "dialog \\" > /tmp/hddtmp.sh
311     echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
312     echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
313     echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
314     echo "--stdout \\" >> /tmp/hddtmp.sh
315     echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
316    
317     for i in ${installdevs}
318     do
319     echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
320     done
321     echo -e "\n" >> /tmp/hddtmp.sh
322    
323     chmod a+x /tmp/hddtmp.sh
324     HDD="$(/tmp/hddtmp.sh)"
325     RES=$?
326     [[ ${RES} -eq 1 ]] && return 1
327     if [[ ${RES} -eq 0 ]]
328     then
329     dialog_setup_hdd_info_auto
330     dialog_setup_hdd_create_partitions
331     setup_hdd_partitions_auto
332     fi
333     fi
334    }
335    
336    dialog_setup_hdd_create_partitions()
337    {
338     dialog \
339     --backtitle "${TITLE}" \
340     --infobox "Erstelle Disk Partitionen ..." 3 70
341    }
342    
343  dialog_setup_hdd_format()  dialog_setup_hdd_format()
344  {  {
345   dialog \   dialog \
# Line 268  dialog_install_meter() Line 365  dialog_install_meter()
365  {  {
366   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
367   do   do
368   CURRENTLINE=$(grep --count . /tmp/install.log)   CURRENTLINE=$(grep -c . /tmp/install.log)
369   PERCENT=$(expr ${CURRENTLINE} \* 100 / ${TOTALLINES})   PERCENT=$(( ${CURRENTLINE} * 100 / ${TOTALLINES}))
370   echo ${PERCENT}   echo ${PERCENT}
371   sleep 1   sleep 1
372   done   done
# Line 320  dialog_main() Line 417  dialog_main()
417   "3" "Beenden und neustarten" \   "3" "Beenden und neustarten" \
418   "4" "Beenden und eine Shell starten")   "4" "Beenden und eine Shell starten")
419   RES=$?   RES=$?
420   if [[ ${RES} -eq 1 ]] && exit 1   [[ ${RES} -eq 1 ]] && exit 1
421   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
422   then   then
423   case ${METHOD} in   case ${METHOD} in
424           "1") dialog_setup_system_menu ;;           "1") dialog_setup_system_menu ;;
425   "2") dialog_setup_hdd_found_manuell ;;   "2") dialog_hardware_detection ;;
426   "3") install_do_reboot ;;   "3") install_do_reboot ;;
427   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
428   esac   esac
# Line 336  dialog_main() Line 433  dialog_main()
433  #################################################  #################################################
434  # Install Komandos #  # Install Komandos #
435  #################################################  #################################################
436    run_hardware_detection()
437    {
438     # check for special devices/clients:
439     # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
440     local removable=0
441     if [[ ! -z $(hwinfo --bios --storage | grep -i zotac) ]]
442     then
443     for i in /sys/block/[hs]d*/removable
444     do
445     if [[ $(< ${i}) = 1 ]]
446     then
447     removable=1
448     fi
449     done
450    
451     # only add this for grub legacy, grub2 detect these settings on its own
452     export GRUBLEGACYOPTS="rootdelay=8"
453     export SPECIALDEVICE="zotac"
454     fi
455    }
456    
457    setup_hdd_partitions_auto()
458    {
459     ROOTHDD="${HDD}1"
460    
461     ## delete disk
462     dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
463    
464     ## setup one bootable partition
465     #1. n= new disk
466     #2. p= primary disk
467     #3. 1= first partition
468     #4. ''= default sector start
469     #5. ''= defaul sector end
470     #6. a= bootable flag
471     #7. 1= boot flag for partition 1
472     #8. w= write/quit
473     fdisk ${HDD} &> /dev/null << EOF
474    n
475    p
476    1
477    
478    
479    a
480    1
481    w
482    EOF
483    }
484    
485  setup_hdd_partitions_manuell()  setup_hdd_partitions_manuell()
486  {  {
487   BOOTHDD="${HDD}1"   BOOTHDD="${HDD}1"
# Line 389  install_system_image() Line 535  install_system_image()
535    
536  install_bootsector_chroot()  install_bootsector_chroot()
537  {  {
538   ### grubconf schreiben   local my_roothdd
539   source ${INSTALLPATH}/boot/kernelversion   local grubconf=${INSTALLPATH}/boot/grub/grub.conf
540     local grub2conf=/boot/grub/grub.cfg
541    
542   #for alx only   # check for grub2
543   if [ -e ${INSTALLPATH}/etc/alx_version ]   if [[ -f ${INSTALLPATH}/sbin/grub-mkconfig ]]
544   then   then
545   OLD_ALXVER="${ALXVER}"   # needed by grub-mkconfig on the first run
546   source ${INSTALLPATH}/etc/alx_version   if [[ ! -f ${INSTALLPATH}/boot/grub/video.lst ]]
547   KRNVER="ALX-${ALXVER}"   then
548   ALXVER="${OLD_ALXVER}"   install -m0644 ${INSTALLPATH}/lib/grub/*/video.lst ${INSTALLPATH}/boot/grub/video.lst || die
549   fi   fi
550    
551   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"   # set kernelopts
552   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"   if [[ -f ${INSTALLPATH}/etc/conf.d/grub ]]
553     then
554   echo "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die   sed -i "s:^\(export GRUB_CMDLINE_LINUX_DEFAULT=\).*:\1\"${KERNELOPTS}\":" ${INSTALLPATH}/etc/conf.d/grub || die
555   echo "timeout 0" >> ${INSTALLPATH}/boot/grub/grub.conf ||die   else
556     echo "export GRUB_CMDLINE_LINUX_DEFAULT=\"${KERNELOPTS}\"" >  ${INSTALLPATH}/etc/conf.d/grub || die
557   echo -e "\ntitle=${KRNVER}" >> ${INSTALLPATH}/boot/grub/grub.conf || die   fi
558   echo "root (hd0,0)" >> ${INSTALLPATH}/boot/grub/grub.conf || die   echo 'grub-mkdevicemap' > ${INSTALLPATH}/root/.installrc || die
559     echo "LC_ALL=C grub-mkconfig -o ${grub2conf}  &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
560   echo "kernel /boot/vmlinuz root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die   echo "grub-install --no-floppy ${HDD} &> /dev/null" >> ${INSTALLPATH}/root/.installrc || die
561   echo "initrd /boot/initrd" >> ${INSTALLPATH}/boot/grub/grub.conf || die   echo "exit 0" >> ${INSTALLPATH}/root/.installrc || die
562    
563   # bootsector schreiben chrooted schreiben (lfs/magellan)   # grub-legacy
564   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   else
565     ### grubconf schreiben
566     source ${INSTALLPATH}/boot/kernelversion
567    
568     #for alx only
569     if [ -e ${INSTALLPATH}/etc/alx_version ]
570     then
571     OLD_ALXVER="${ALXVER}"
572     source ${INSTALLPATH}/etc/alx_version
573     KRNVER="ALX-${ALXVER}"
574     ALXVER="${OLD_ALXVER}"
575     fi
576    
577     [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
578     [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
579     [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
580    
581     # uuid support
582     if is_uuid_supported
583     then
584     my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
585     else
586     my_roothdd="${ROOTHDD}"
587     fi
588    
589     : > ${grubconf} || die
590     echo "default 0" >> ${grubconf} || die
591     echo "timeout 3" >> ${grubconf} || die
592     # using current root password
593     echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
594    
595     echo  >> ${grubconf} || die
596     echo "# normal boot" >> ${grubconf} || die
597     echo "title ${KRNVER}" >> ${grubconf} || die
598     echo "root (hd0,0)" >> ${grubconf} || die
599     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS}" >> ${grubconf} || die
600     if is_initrd_supported
601     then
602     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
603     fi
604    
605     echo >> ${grubconf} || die
606     echo "# admin boot" >> ${grubconf} || die
607     echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
608     echo "lock"  >> ${grubconf} || die
609     echo "root (hd0,0)" >> ${grubconf} || die
610     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} hardware-auto-detection" >> ${grubconf} || die
611     if is_initrd_supported
612     then
613     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
614     fi
615    
616     echo >> ${grubconf} || die
617     echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
618     echo "lock"  >> ${grubconf} || die
619     echo "root (hd0,0)" >> ${grubconf} || die
620     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} ${GRUBLEGACYOPTS} alx-reset-settings" >> ${grubconf} || die
621     if is_initrd_supported
622     then
623     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
624     fi
625    
626     # bootsector schreiben chrooted schreiben (lfs/magellan)
627     cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
628  /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
629  root (hd0,0)  root (hd0,0)
630  setup (hd0)  setup (hd0)
631  quit  quit
632  EOF  EOF
 echo "MODULES=\"ext3 amd74xx piix sis5513 via82cxxx\" > /etc/conf.d/mkinitrd  
 mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g")  
633  exit 0  exit 0
634  CHROOTEOF  CHROOTEOF
635     fi
636    
637   ## enters chroot   ## enters chroot
638   mount -t proc proc ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
639   mount -t sysfs sysfs ${INSTALLPATH}/sysfs   mount -t sysfs sysfs ${INSTALLPATH}/sys
640   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
641   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
642   umount ${INSTALLPATH}/proc   umount ${INSTALLPATH}/proc
643   umount ${INSTALLPATH}/sys   umount ${INSTALLPATH}/sys
644   umount ${INSTALLPATH}/dev   umount ${INSTALLPATH}/dev
645   rm ${INSTALLPATH}/root/.bashrc   rm ${INSTALLPATH}/root/.installrc
646    }
647    
648    is_initrd_supported()
649    {
650     # only generate initrds if the cmd exists
651     [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
652     return 1
653    }
654    
655    install_initrd_chroot()
656    {
657     # only generate initrds if the cmd exists
658     is_initrd_supported || return 0
659    
660     DISKMODS="sd_mod"
661     OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
662     PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
663     SATAMODS="sata_via sata_sis sata_nv"
664     DRMMODS="i915 mga nouveau r128 radeon savage sis tdfx ttm via"
665     FBMODS="uvesafb"
666    
667     # install an appropriate uvesafb.conf
668     install -d ${INSTALLPATH}/etc/modprobe.d || die
669     echo "options uvesafb mode_option=1024x768-32@60 scroll=ywrap" > ${INSTALLPATH}/etc/modprobe.d/uvesafb.conf || die
670    
671     cat > ${INSTALLPATH}/root/.installrc << CHROOTEOF
672    echo "MODULES=\"${FORMAT_FILESYSTEM} ${DISKMODS} ${OLDATAMODS} ${PATAMODS} ${SATAMODS} ${DRMMODS} ${FBMODS}\"" > /etc/conf.d/mkinitrd
673    mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
674    exit 0
675    CHROOTEOF
676    
677     ## enters chroot
678     mount -t proc proc ${INSTALLPATH}/proc
679     mount -t sysfs sysfs ${INSTALLPATH}/sys
680     mount -o bind /dev ${INSTALLPATH}/dev
681     chroot ${INSTALLPATH} /bin/bash --rcfile /root/.installrc -i
682     umount ${INSTALLPATH}/proc
683     umount ${INSTALLPATH}/sys
684     umount ${INSTALLPATH}/dev
685     rm ${INSTALLPATH}/root/.installrc
686    }
687    
688    is_uuid_supported()
689    {
690     if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
691     then
692     # only detect uuids if supported
693     if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
694     then
695     return 0
696     fi
697     fi
698    
699     return 1
700    }
701    
702    get_uuid()
703    {
704     local UUID
705     local SEC_TYPE
706     local TYPE
707    
708     local dev="$1"
709     [[ -z ${dev} ]] && die "no dev given"
710    
711     # check if given device is already an UUID
712     if [[ ${dev/UUID=/}x != ${dev}x ]]
713     then
714     eval "${dev}"
715     else
716     eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
717     fi
718     echo "${UUID}"
719  }  }
720    
721  install_system_settings()  install_system_settings()
722  {  {
723   # schreibe fstab   # schreibe fstab
724   echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
725   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
726   echo -e "${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
727     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
728     else
729     echo -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
730     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
731     fi
732     # not needed busybox loads all with swapon -a, even if not mentioned in fstab
733     #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
734   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
735   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
736    
737     # install network config skeleton
738     install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
739  }  }
740    
741  install_system_settings_flash()  install_system_settings_flash()
742  {  {
743   # schreibe fstab   # schreibe fstab
744   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
745     then
746     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
747     else
748     echo -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
749     fi
750   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
751   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
752  }  }
# Line 479  install_do_reboot() Line 776  install_do_reboot()
776    
777  run_install_normal()  run_install_normal()
778  {  {
779   dialog_setup_hdd_found_manuell   dialog_hardware_detection
780    
781   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manuell
782   dialog_setup_hdd_format   dialog_setup_hdd_format
# Line 487  run_install_normal() Line 784  run_install_normal()
784   install_mount_rootfs   install_mount_rootfs
785   (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
786    
  dialog_install_bootsector  
  install_bootsector_chroot  
   
787   dialog_install_settings   dialog_install_settings
788   sleep 1   sleep 1
789   install_system_settings   install_system_settings
790     install_initrd_chroot
791    
792     dialog_install_bootsector
793     install_bootsector_chroot
794    
795   install_umount_rootfs   install_umount_rootfs
796   dialog_install_successful   dialog_install_successful
797  }  }
798    
799  run_install_flash()  run_install_flash()
800  {  {
801   dialog_setup_hdd_found_manuell   dialog_hardware_detection
802    
803   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_flash
804   dialog_setup_hdd_format   dialog_setup_hdd_format
# Line 507  run_install_flash() Line 806  run_install_flash()
806   install_mount_rootfs_flash   install_mount_rootfs_flash
807   (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
808    
809     dialog_install_settings
810     sleep 1
811     install_system_settings_flash
812     install_initrd_chroot
813    
814   dialog_install_bootsector   dialog_install_bootsector
815   install_bootsector_chroot   install_bootsector_chroot
816    
817     install_umount_rootfs_flash
818     dialog_install_successful
819    }
820    
821    run_install_auto()
822    {
823     dialog_hardware_detection
824    
825     dialog_setup_hdd_partitions_auto
826     dialog_setup_hdd_format
827     setup_hdd_format_flash > /dev/null
828     install_mount_rootfs_flash
829     (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
830    
831   dialog_install_settings   dialog_install_settings
832   sleep 1   sleep 1
833   install_system_settings_flash   install_system_settings_flash
834     install_initrd_chroot
835    
836     dialog_install_bootsector
837     install_bootsector_chroot
838    
839   install_umount_rootfs_flash   install_umount_rootfs_flash
840   dialog_install_successful   dialog_install_successful
841  }  }

Legend:
Removed from v.523  
changed lines
  Added in v.2736