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 520 by niro, Fri Jun 27 22:27:46 2008 UTC revision 1579 by niro, Mon Oct 18 14:21:27 2010 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.7 2008-06-27 22:27:46 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="0.3.6"
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    # standart kernel opts
35    KERNELOPTS="quiet"
36    
37    # default specialdevices
38    SPECIALDEVICE=""
39    
40  #################################################  #################################################
41  #  DIALOG BOXEN #  #  DIALOG BOXEN #
# Line 94  dialog_setup_hdd_info_flash() Line 97  dialog_setup_hdd_info_flash()
97   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
98  }  }
99    
100    dialog_setup_hdd_info_auto()
101    {
102     local SHDD="$(echo $HDD | sed 's/\/dev\///')"
103    
104     dialog \
105     --colors \
106     --title "[ Festplatten Partitionierung ]" \
107     --backtitle "${TITLE}" \
108     --ok-label "Weiter" \
109     --msgbox "\nAchtung!\n\
110     Alle Daten werden von der Disk [ \Z3${HDD}\Zn ] gelöscht!" 12 81
111    }
112    
113  dialog_setup_system_menu()  dialog_setup_system_menu()
114  {  {
115   local i   local i
# Line 104  dialog_setup_system_menu() Line 120  dialog_setup_system_menu()
120   --cancel-label "Abbrechen" \   --cancel-label "Abbrechen" \
121   --ok-label "Weiter" \   --ok-label "Weiter" \
122   --stdout \   --stdout \
123     --colors \
124   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \
125   "1" "Normale IDE-Disk" \   "1" "Automatisches Setup (Empfohlen)" \
126   "2" "Flash-Speicher")   "" "" \
127     "" "\Z1Experten Modi:\Zn" \
128     "2" "Normale IDE-Disk (Manuell)" \
129     "3" "Flash-Speicher (Manuell)")
130   RES=$?   RES=$?
131   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
132   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
133   then   then
134   case "${i}" in   case "${i}" in
135           "1") run_install_normal ;;   "1") run_install_auto ;;
136   "2") run_install_flash ;;           "2") run_install_normal ;;
137     "3") run_install_flash ;;
138     "") dialog_setup_system_menu;;
139   esac   esac
140   fi   fi
141  }  }
142    
143  dialog_setup_hdd_found_manuell()  dialog_hardware_detection()
144  {  {
145   local i   local i
146     local hwtmp
147    
148     if [ -x $(which mktemp &> /dev/null) ]
149     then
150     hwtmp="$(mktemp)"
151     else
152     hwtmp="/tmp/hwtmp.sh"
153     fi
154    
155   [[ ! -z ${installdevs} ]] && installdevs=""   [[ ! -z ${installdevs} ]] && installdevs=""
156    
157   echo "dialog \\"  > /tmp/hddtmp.sh   echo "dialog \\"  > ${hwtmp}
158   echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh   echo "--backtitle \"${TITLE}\" \\" >> ${hwtmp}
159   echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh   echo "--ok-label \"Weiter\" \\" >> ${hwtmp}
160   echo "--stdout \\" >> /tmp/hddtmp.sh   echo "--stdout \\" >> ${hwtmp}
161   echo "--colors \\" >> /tmp/hddtmp.sh   echo "--colors \\" >> ${hwtmp}
162   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> /tmp/hddtmp.sh   echo "--msgbox \"Gefundene Hardware:\n\n \\" >> ${hwtmp}
163   echo " Festplatten:\n \\" >> /tmp/hddtmp.sh   echo " Festplatten:\n \\" >> ${hwtmp}
164    
165   if [[ ! -z ${scsidisks} ]]   if [[ ! -z ${scsidisks} ]]
166   then   then
# Line 138  dialog_setup_hdd_found_manuell() Line 168  dialog_setup_hdd_found_manuell()
168   do   do
169   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
170   then   then
171   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7SCSI: \\Z3${i}\\Zn\n \\" >> ${hwtmp}
172   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
173   fi   fi
174   done   done
# Line 150  dialog_setup_hdd_found_manuell() Line 180  dialog_setup_hdd_found_manuell()
180   do   do
181   if [[ ${i} != ${cdromdev} ]]   if [[ ${i} != ${cdromdev} ]]
182   then   then
183   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " \\Z7IDE:  \\Z3${i}\\Zn\n \\" >> ${hwtmp}
184   installdevs="${installdevs} ${i}"   installdevs="${installdevs} ${i}"
185   fi   fi
186   done   done
# Line 158  dialog_setup_hdd_found_manuell() Line 188  dialog_setup_hdd_found_manuell()
188    
189   if [[ ! -z ${cdromdev} ]]   if [[ ! -z ${cdromdev} ]]
190   then   then
191   echo " \n \\" >> /tmp/hddtmp.sh   echo " \n \\" >> ${hwtmp}
192   echo " \\Z7andere Laufwerke:\n \\" >> /tmp/hddtmp.sh   echo " \\Z7andere Laufwerke:\n \\" >> ${hwtmp}
193   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> /tmp/hddtmp.sh   echo " CDROM: \\Z3${cdromdev}\\Zn\n \\" >> ${hwtmp}
194   fi   fi
195   echo " \" 13 70" >> /tmp/hddtmp.sh  
196   chmod a+x /tmp/hddtmp.sh   # other devices
197   /tmp/hddtmp.sh   run_hardware_detection
198     case "${SPECIALDEVICE}" in
199     zotac) echo " \n\n\n \\Z2Zotac Device erkannt!\\Zn \\" >> ${hwtmp} ;;
200     *) echo " \n\n\n \\ZnStandard Device erkannt!\\Zn \\" >> ${hwtmp} ;;
201     esac
202    
203     echo " \" 13 70" >> ${hwtmp}
204     chmod a+x ${hwtmp}
205     ${hwtmp}
206    
207     # remove tmp file
208     if [[ -f ${hwtmp} ]]
209     then
210     rm ${hwtmp}
211     fi
212  }  }
213    
214  dialog_setup_hdd_partitions_manuell()  dialog_setup_hdd_partitions_manuell()
# Line 243  dialog_setup_hdd_partitions_manuell_flas Line 287  dialog_setup_hdd_partitions_manuell_flas
287   fi   fi
288  }  }
289    
290  dialog_setup_hdd_partitions_silent()  dialog_setup_hdd_partitions_auto()
291    {
292     local i
293    
294     if [[ -z ${installdevs} ]]
295     then
296     dialog \
297     --backtitle "${TITLE}" \
298     --ok-label "Beenden" \
299     --msgbox "Kein geeignetes Laufwerk gefunden.\nDie Installation ist fehlgeschlagen." 6 70
300     exit 1
301     else
302    
303     echo "dialog \\" > /tmp/hddtmp.sh
304     echo "--backtitle \"${TITLE}\" \\" >> /tmp/hddtmp.sh
305     echo "--ok-label \"Weiter\" \\" >> /tmp/hddtmp.sh
306     echo "--cancel-label \"Beenden\" \\" >> /tmp/hddtmp.sh
307     echo "--stdout \\" >> /tmp/hddtmp.sh
308     echo "--menu \"Installations Laufwerk auswaehlen:\" 10 70 3 \\" >> /tmp/hddtmp.sh
309    
310     for i in ${installdevs}
311     do
312     echo "\"${i}\" \"\" \\" >> /tmp/hddtmp.sh
313     done
314     echo -e "\n" >> /tmp/hddtmp.sh
315    
316     chmod a+x /tmp/hddtmp.sh
317     HDD="$(/tmp/hddtmp.sh)"
318     RES=$?
319     [[ ${RES} -eq 1 ]] && return 1
320     if [[ ${RES} -eq 0 ]]
321     then
322     dialog_setup_hdd_info_auto
323     dialog_setup_hdd_create_partitions
324     setup_hdd_partitions_auto
325     fi
326     fi
327    }
328    
329    dialog_setup_hdd_create_partitions()
330  {  {
331   dialog \   dialog \
332   --backtitle "${TITLE}" \   --backtitle "${TITLE}" \
333   --infobox "Erstelle Partitionen ..." 3 70   --infobox "Erstelle Disk Partitionen ..." 3 70
334  }  }
335    
336  dialog_setup_hdd_format()  dialog_setup_hdd_format()
# Line 275  dialog_install_meter() Line 358  dialog_install_meter()
358  {  {
359   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
360   do   do
361   CURRENTLINE=$(grep --count . /tmp/install.log)   CURRENTLINE=$(grep -c . /tmp/install.log)
362   PERCENT=$(expr ${CURRENTLINE} \* 100 / ${TOTALLINES})   PERCENT=$(( ${CURRENTLINE} * 100 / ${TOTALLINES}))
363   echo ${PERCENT}   echo ${PERCENT}
364   sleep 1   sleep 1
365   done   done
# Line 292  dialog_install_bootsector() Line 375  dialog_install_bootsector()
375   --infobox "Schreibe den Bootsektor ..." 3 70   --infobox "Schreibe den Bootsektor ..." 3 70
376  }  }
377    
 dialog_install_alxconfig()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Installiere die ALX Setup-Tools ..." 3 70  
 }  
   
 dialog_install_kernel_image()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Installiere den System-Kernel ..." 3 70  
   
 }  
   
 dialog_install_hotfixes()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Installiere Hotfixes ..." 3 70  
   
 }  
   
378  dialog_install_successful()  dialog_install_successful()
379  {  {
380   dialog \   dialog \
# Line 333  dialog_install_failure() Line 393  dialog_install_failure()
393   " 10 81   " 10 81
394  }  }
395    
 dialog_install_method()  
 {  
   
  METHOD=$(dialog \  
  --backtitle "${TITLE}" \  
  --cancel-label "Abbrechen" \  
  --ok-label "Weiter" \  
  --stdout \  
  --menu "Konfiguration" 14 70 5 \  
  "1" "Normale Installation" \  
  "2" "Silent Installation")  
  RES=$?  
  [[ ${RES} -eq 1 ]] && return 1  
  if [[ ${RES} -eq 0 ]]  
  then  
  case ${METHOD} in  
          "1") run_install_normal ;;  
  "2") dialog_warning ; run_install_silent ;;  
  esac  
  fi  
 }  
   
396  dialog_main()  dialog_main()
397  {  {
398   METHOD=0   METHOD=0
# Line 372  dialog_main() Line 410  dialog_main()
410   "3" "Beenden und neustarten" \   "3" "Beenden und neustarten" \
411   "4" "Beenden und eine Shell starten")   "4" "Beenden und eine Shell starten")
412   RES=$?   RES=$?
413   if [[ ${RES} -eq 1 ]] && exit 1   [[ ${RES} -eq 1 ]] && exit 1
414   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
415   then   then
416   case ${METHOD} in   case ${METHOD} in
417           "1") dialog_setup_system_menu ;;           "1") dialog_setup_system_menu ;;
418   "2") dialog_setup_hdd_found_manuell ;;   "2") dialog_hardware_detection ;;
419   "3") install_do_reboot ;;   "3") install_do_reboot ;;
420   "4") /bin/bash --login -i ;;   "4") /bin/bash --login -i ;;
421   esac   esac
# Line 388  dialog_main() Line 426  dialog_main()
426  #################################################  #################################################
427  # Install Komandos #  # Install Komandos #
428  #################################################  #################################################
429    run_hardware_detection()
430    {
431     # check for special devices/clients:
432     # if zotac a zotac and the disk is a removeable device, then add rootdelay to kernelcmd
433     local removable=0
434     if [[ ! -z $(lspci -v | grep -i zotac) ]]
435     then
436     for i in /sys/block/[hs]d*/removable
437     do
438     if [[ $(< ${i}) = 1 ]]
439     then
440     removable=1
441     fi
442     done
443    
444     export KERNELOPTS="${KERNELOPTS} rootdelay=8"
445     export SPECIALDEVICE="zotac"
446     fi
447    }
448    
449    setup_hdd_partitions_auto()
450    {
451     ROOTHDD="${HDD}1"
452    
453     ## delete disk
454     dd if=/dev/zero of=${HDD} count=1 &> /dev/null || die
455    
456     ## setup one bootable partition
457     #1. n= new disk
458     #2. p= primary disk
459     #3. 1= first partition
460     #4. ''= default sector start
461     #5. ''= defaul sector end
462     #6. a= bootable flag
463     #7. 1= boot flag for partition 1
464     #8. w= write/quit
465     fdisk ${HDD} &> /dev/null << EOF
466    n
467    p
468    1
469    
470    
471    a
472    1
473    w
474    EOF
475    }
476    
477  setup_hdd_partitions_manuell()  setup_hdd_partitions_manuell()
478  {  {
479   BOOTHDD="${HDD}1"   BOOTHDD="${HDD}1"
# Line 406  setup_hdd_partitions_manuell_flash() Line 492  setup_hdd_partitions_manuell_flash()
492   cfdisk ${HDD} || die   cfdisk ${HDD} || die
493  }  }
494    
 setup_hdd_partitions_silent()  
 {  
  ## hdds löschen  
  dd if=/dev/zero of=${HDD} bs=1024k count=1 || die  
  ## hdds partitionieren silent  
  fdisk ${HDD} < ${CONFIGS_TEMPLATE}/fdisksettings  
   
  read  
 }  
   
495  setup_hdd_format()  setup_hdd_format()
496  {  {
497   mkswap ${SWAPHDD} || die   mkswap ${SWAPHDD} || die
# Line 449  install_system_image() Line 525  install_system_image()
525   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}   tar xvjpf ${CDPATH}/system/${CDIMAGENAME} -C ${INSTALLPATH}
526  }  }
527    
   
 install_kernel_image()  
 {  
  declare -i CPUTYPE=$(cat /proc/cpuinfo | grep "cpu family" | cut -d ' ' -f3)  
   
  if [[ ${CPUTYPE} -le 5 ]]  
  then  
  lastdir="$(pwd)"  
   
  mkdir -p ${INSTALLPATH}/INSTALL/kernel || die  
  cd ${INSTALLPATH}/INSTALL/kernel || die  
  tar xzpf ${CDPATH}/kernels/kernel-i386.tar.gz || die  
  source ${INSTALLPATH}/INSTALL/kernel/kernelversion || die  
   
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNLIB} ${INSTALLPATH}/lib/modules || die  
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNIMG} ${INSTALLPATH}/boot || die  
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNINITRD} ${INSTALLPATH}/boot || die  
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/kernelversion ${INSTALLPATH}/boot || die  
   
  cd ${lastdir} || die  
   
         elif [[ ${CPUTYPE} -ge 6 ]]  
  then  
  lastdir="$(pwd)"  
   
  mkdir -p ${INSTALLPATH}/INSTALL/kernel || die  
  cd ${INSTALLPATH}/INSTALL/kernel || die  
  tar xzpf ${CDPATH}/kernels/kernel-i686.tar.gz || die  
  source ${INSTALLPATH}/INSTALL/kernel/kernelversion || die  
   
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNLIB} ${INSTALLPATH}/lib/modules || die  
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNIMG} ${INSTALLPATH}/boot || die  
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/${KRNINITRD} ${INSTALLPATH}/boot || die  
  cp -aRf ${INSTALLPATH}/INSTALL/kernel/kernelversion ${INSTALLPATH}/boot || die  
   
  cd ${lastdir} || die  
         fi  
 }  
   
 install_bootsector()  
 {  
  ### grubconf schreiben  
  source ${INSTALLPATH}/INSTALL/kernel/kernelversion  
   
  [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"  
  [[ -z ${KRNIMG} ]] && KRNIMG="bzImage"  
  [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"  
   
   
  echo -e "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die  
  echo -e "timeout 03" >> ${INSTALLPATH}/boot/grub/grub.conf ||die  
  echo -e "\ntitle=${KRNVER}" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
  echo -e "root (hd0,0)" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
   
  echo -e "kernel (hd0,0)/boot/${KRNIMG} root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
   
  ### bootsector schreiben  
  /sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null || die  
 root (hd0,0)  
 setup (hd0)  
 quit  
 EOF  
 }  
   
528  install_bootsector_chroot()  install_bootsector_chroot()
529  {  {
530     local my_roothdd
531    
532   ### grubconf schreiben   ### grubconf schreiben
533   source ${INSTALLPATH}/boot/kernelversion   source ${INSTALLPATH}/boot/kernelversion
534    
# Line 526  install_bootsector_chroot() Line 540  install_bootsector_chroot()
540   KRNVER="ALX-${ALXVER}"   KRNVER="ALX-${ALXVER}"
541   ALXVER="${OLD_ALXVER}"   ALXVER="${OLD_ALXVER}"
542   fi   fi
543    
544   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"   [[ -z ${KRNVER} ]] && KRNVER="AutoSta_LX"
  [[ -z ${KRNIMG} ]] && KRNIMG="bzImage"  
545   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"   [[ -z ${KRNINITRD} ]] && KRNINITRD="initrd"
546     [[ -z ${KRNIMG} ]] && KRNIMG="vmlinuz"
547    
548   echo -e "default 0" > ${INSTALLPATH}/boot/grub/grub.conf || die   # uuid support
549   echo -e "timeout 0" >> ${INSTALLPATH}/boot/grub/grub.conf ||die   if is_uuid_supported
   
  echo -e "\ntitle=${KRNVER}" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
  echo -e "root (hd0,0)" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
   
  echo -e "kernel (hd0,0)/boot/${KRNIMG} root=${ROOTHDD} quiet" >> ${INSTALLPATH}/boot/grub/grub.conf || die  
   
  ### bootsector schreiben chrooted schreiben (gentoo)  
  if [ -f ${INSTALLPATH}/sbin/grub ]  
550   then   then
551   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   my_roothdd="UUID=$(get_uuid ${ROOTHDD})"
552  /sbin/grub --no-floppy --batch << "EOF" 1> /dev/null 2> /dev/null   else
553  root (hd0,0)   my_roothdd="${ROOTHDD}"
554  setup (hd0)   fi
555  quit  
556  EOF   local grubconf=${INSTALLPATH}/boot/grub/grub.conf
557  exit 0   : > ${grubconf} || die
558  CHROOTEOF   echo "default 0" >> ${grubconf} || die
559     echo "timeout 3" >> ${grubconf} || die
560     # using current root password
561     echo "password --md5 $(cat ${INSTALLPATH}/etc/shadow | grep root | cut -d: -f2)"  >> ${grubconf} || die
562    
563     echo  >> ${grubconf} || die
564     echo "# normal boot" >> ${grubconf} || die
565     echo "title ${KRNVER}" >> ${grubconf} || die
566     echo "root (hd0,0)" >> ${grubconf} || die
567     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS}" >> ${grubconf} || die
568     if is_initrd_supported
569     then
570     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
571   fi   fi
572    
573   ### bootsector schreiben chrooted schreiben (lfs/magellan)   echo >> ${grubconf} || die
574   if [ -f ${INSTALLPATH}/usr/sbin/grub ]   echo "# admin boot" >> ${grubconf} || die
575     echo "title ${KRNVER} - Re-run hardware-detection" >> ${grubconf} || die
576     echo "lock"  >> ${grubconf} || die
577     echo "root (hd0,0)" >> ${grubconf} || die
578     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} hardware-auto-detection" >> ${grubconf} || die
579     if is_initrd_supported
580   then   then
581   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF   echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
582     fi
583    
584     echo >> ${grubconf} || die
585     echo "title ${KRNVER} - Reset *all* local settings" >> ${grubconf} || die
586     echo "lock"  >> ${grubconf} || die
587     echo "root (hd0,0)" >> ${grubconf} || die
588     echo "kernel /boot/${KRNIMG} root=${my_roothdd} ${KERNELOPTS} alx-reset-settings" >> ${grubconf} || die
589     if is_initrd_supported
590     then
591     echo "initrd /boot/${KRNINITRD}" >> ${grubconf} || die
592     fi
593    
594     # bootsector schreiben chrooted schreiben (lfs/magellan)
595     cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
596  /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
597  root (hd0,0)  root (hd0,0)
598  setup (hd0)  setup (hd0)
# Line 563  quit Line 600  quit
600  EOF  EOF
601  exit 0  exit 0
602  CHROOTEOF  CHROOTEOF
  fi  
603    
604   ##enters chroot   ## enters chroot
605   mount -t proc none ${INSTALLPATH}/proc   mount -t proc proc ${INSTALLPATH}/proc
606     mount -t sysfs sysfs ${INSTALLPATH}/sys
607   mount -o bind /dev ${INSTALLPATH}/dev   mount -o bind /dev ${INSTALLPATH}/dev
608   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i   chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i
609   umount ${INSTALLPATH}/proc   umount ${INSTALLPATH}/proc
610     umount ${INSTALLPATH}/sys
611   umount ${INSTALLPATH}/dev   umount ${INSTALLPATH}/dev
612   rm ${INSTALLPATH}/root/.bashrc   rm ${INSTALLPATH}/root/.bashrc
613  }  }
614    
615  install_alxconfig()  is_initrd_supported()
616  {  {
617   lastdir="$(pwd)"   # only generate initrds if the cmd exists
618     [[ -x ${INSTALLPATH}/sbin/mkinitrd ]] && return 0
619     return 1
620    }
621    
622   mkdir -p ${INSTALLPATH}/opt/alx-config || die  install_initrd_chroot()
623   cd ${INSTALLPATH}/opt/alx-config || die  {
624   tar xzpf ${CDPATH}/alx-config/alx-config.tar.gz || die   # only generate initrds if the cmd exists
625   chmod a+x ${INSTALLPATH}/opt/alx-config/Configurator/config_functions.sh || die   is_initrd_supported || return 0
  chmod a+x ${INSTALLPATH}/opt/alx-config/Configurator/config_menu.sh || die  
  ln -sf /opt/alx-config/Configurator/config_menu.sh ${INSTALLPATH}/bin/ALXConfig || die  
626    
627   cd ${lastdir} || die   cat > ${INSTALLPATH}/root/.bashrc << CHROOTEOF
628    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
629    mkinitrd -f /boot/$(readlink /boot/initrd) $(readlink /boot/vmlinuz | sed "s:kernel-::g") > /dev/null
630    exit 0
631    CHROOTEOF
632    
633     ## enters chroot
634     mount -t proc proc ${INSTALLPATH}/proc
635     mount -t sysfs sysfs ${INSTALLPATH}/sys
636     mount -o bind /dev ${INSTALLPATH}/dev
637     chroot ${INSTALLPATH} /bin/bash --rcfile /root/.bashrc -i
638     umount ${INSTALLPATH}/proc
639     umount ${INSTALLPATH}/sys
640     umount ${INSTALLPATH}/dev
641     rm ${INSTALLPATH}/root/.bashrc
642  }  }
643    
644    is_uuid_supported()
645    {
646     if [[ -x $(which busybox.mkinitrd &> /dev/null) ]]
647     then
648     # only detect uuids if supported
649     if [[ ! -z $(busybox.mkinitrd | grep blkid) ]]
650     then
651     return 0
652     fi
653     fi
654    
655     return 1
656    }
657    
658  install_system_settings()  get_uuid()
659  {  {
660   ### schreibe fstab   local UUID
661   echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die   local SEC_TYPE
662   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die   local TYPE
663   echo -e "${SWAPHDD}\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die  
664   echo -e "none\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   local dev="$1"
665     [[ -z ${dev} ]] && die "no dev given"
666    
667   echo -e "none\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   # check if given device is already an UUID
668   echo -e "none\t/proc/bus/usb\tusbfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   if [[ ${dev/UUID=/}x != ${dev}x ]]
669     then
670     eval "${dev}"
671     else
672     eval $(busybox.mkinitrd blkid ${dev} | grep "${dev}:" | sed 's/.*:\ //')
673     fi
674     echo "${UUID}"
675  }  }
676    
677  install_system_settings_flash()  install_system_settings()
678  {  {
679   ### schreibe fstab   # schreibe fstab
680   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die   if is_uuid_supported
681   echo -e "none\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   then
682     echo -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
683     echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
684     else
685     echo -e "${BOOTHDD}\t/boot\text3\tnoatime,noauto\t1 1" > ${INSTALLPATH}/etc/fstab || die
686     echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" >> ${INSTALLPATH}/etc/fstab || die
687     fi
688     # not needed busybox loads all with swapon -a, even if not mentioned in fstab
689     #echo -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0" >> ${INSTALLPATH}/etc/fstab || die
690     echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
691     echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
692    
693   echo -e "none\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   # install network config skeleton
694   echo -e "none\t/proc/bus/usb\tusbfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die   install -m0644 ${INSTALLPATH}/etc/alxconfig-ng/skel/net/net.eth0 ${INSTALLPATH}/etc/conf.d/ || die
695  }  }
696    
697  install_hotfixes()  install_system_settings_flash()
698  {  {
699   if [ -f ${CDPATH}/hotfixes/hotfixes.sh ]   # schreibe fstab
700     if is_uuid_supported
701   then   then
702   dialog_hotfixes   echo -e "UUID=$(get_uuid ${ROOTHDD})\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
703   sleep1   else
704   ${CDPATH}/hotfixes/hotfixes.sh   echo -e "${ROOTHDD}\t/\text3\tnoatime\t0 0" > ${INSTALLPATH}/etc/fstab || die
705   fi   fi
706     echo -e "proc\t/proc\tproc\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
707     echo -e "shm\t/dev/shm\ttmpfs\tdefaults\t0 0" >> ${INSTALLPATH}/etc/fstab || die
708  }  }
709    
710  install_umount_rootfs()  install_umount_rootfs()
# Line 646  install_do_reboot() Line 732  install_do_reboot()
732    
733  run_install_normal()  run_install_normal()
734  {  {
735   dialog_setup_hdd_found_manuell   dialog_hardware_detection
736    
737   dialog_setup_hdd_partitions_manuell   dialog_setup_hdd_partitions_manuell
738   dialog_setup_hdd_format   dialog_setup_hdd_format
# Line 660  run_install_normal() Line 746  run_install_normal()
746   dialog_install_settings   dialog_install_settings
747   sleep 1   sleep 1
748   install_system_settings   install_system_settings
749   install_hotfixes   install_initrd_chroot
750   install_umount_rootfs   install_umount_rootfs
751   dialog_install_successful   dialog_install_successful
752  }  }
753    
754  run_install_flash()  run_install_flash()
755  {  {
756   dialog_setup_hdd_found_manuell   dialog_hardware_detection
757    
758   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_flash
759   dialog_setup_hdd_format   dialog_setup_hdd_format
# Line 681  run_install_flash() Line 767  run_install_flash()
767   dialog_install_settings   dialog_install_settings
768   sleep 1   sleep 1
769   install_system_settings_flash   install_system_settings_flash
770   install_hotfixes   install_initrd_chroot
771   install_umount_rootfs_flash   install_umount_rootfs_flash
772   dialog_install_successful   dialog_install_successful
773  }  }
774    
775  run_install_silent()  run_install_auto()
776  {  {
777   echo "starting silent install ..."   dialog_hardware_detection
  sleep 1  
 }  
778    
779  run_install_unattended()   dialog_setup_hdd_partitions_auto
780  {   dialog_setup_hdd_format
781   echo "starting unattended install ..."   setup_hdd_format_flash > /dev/null
782     install_mount_rootfs_flash
783     (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | dialog_install_meter | dialog_install_system_image
784    
785     dialog_install_bootsector
786     install_bootsector_chroot
787    
788     dialog_install_settings
789   sleep 1   sleep 1
790     install_system_settings_flash
791     install_initrd_chroot
792     install_umount_rootfs_flash
793     dialog_install_successful
794  }  }
795    
796  if [[ $1 = unattended ]]  dialog_main
 then  
  run_install_unattended  
 else  
  dialog_main  
 fi  
797    
798  exit 0  exit 0

Legend:
Removed from v.520  
changed lines
  Added in v.1579