Magellan Linux

Diff of /trunk/installer-simple/bin/installer.sh.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2422 by niro, Tue Jan 7 13:54:06 2014 UTC revision 2427 by niro, Tue Jan 7 14:09:01 2014 UTC
# Line 246  run_hardware_detection_disks() Line 246  run_hardware_detection_disks()
246   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
247  }  }
248    
249  dialog_setup_hdd_create_partitions()  install_meter()
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Erstelle Disk Partitionen ..." 3 70  
 }  
   
 dialog_setup_hdd_format()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Erstelle Datei-Systeme ..." 3 70  
 }  
   
 dialog_install_settings()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Speichere System-Einstellungen ..." 3 70  
 }  
   
 dialog_install_system_image()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --gauge "Kopiere System-Image ..." 6 80  
 }  
   
 dialog_install_meter()  
250  {  {
251   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
252   do   do
# Line 287  dialog_install_meter() Line 259  dialog_install_meter()
259   return 0   return 0
260  }  }
261    
   
 dialog_install_bootsector()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --infobox "Schreibe den Bootsektor ..." 3 70  
 }  
   
 dialog_install_successful()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --colors \  
  --msgbox "Die Installation war \Z2erfolgreich\Zn." 5 81  
 }  
   
 dialog_install_failure()  
 {  
  dialog \  
  --backtitle "${TITLE}" \  
  --colors \  
  --msgbox "Die Installation ist \Z1Fehlgeschlagen\Zn.\n\n\  
  Fehler bei ${ERROR}, RetVal: ${RETVAL} \  
  " 10 81  
 }  
   
262  dialog_main()  dialog_main()
263  {  {
264   METHOD=0   local method=0
265     local retval
266    
267   while [[ ${METHOD} -le 2 ]]   while [[ ${method} -le 2 ]]
268   do   do
269   METHOD=$(dialog \   method=$(menubox $"Configuration:" \
270   --backtitle "${TITLE}" \   $"1:Install system" \
271   --no-cancel \   $"2:Show detected harddrives" \
272   --ok-label "Weiter" \   $"3:Exit and reboot" \
273   --stdout \   $"4:Exit and drop into a shell")
274   --menu "Konfiguration" 14 70 5 \   retval=$?
275   "1" "AutoSta_LX installieren" \   [[ ${retval} -eq 1 ]] && exit 1
276   "2" "Uebersicht gefundener Laufwerke" \   if [[ ${retval} -eq 0 ]]
  "3" "Beenden und neustarten" \  
  "4" "Beenden und eine Shell starten")  
  RES=$?  
  [[ ${RES} -eq 1 ]] && exit 1  
  if [[ ${RES} -eq 0 ]]  
277   then   then
278   case ${METHOD} in   case ${method} in
279   "1") dialog_setup_system_menu ;;   "1") dialog_setup_system_menu ;;
280   "2") dialog_hardware_detection ;;   "2") dialog_hardware_detection ;;
281   "3") install_do_reboot ;;   "3") install_do_reboot ;;
# Line 768  run_install_normal() Line 710  run_install_normal()
710   dialog_setup_hdd_format   dialog_setup_hdd_format
711   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
712   install_mount_rootfs   install_mount_rootfs
713   (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 | install_meter | dialog_install_system_image
714    
715   dialog_install_settings   dialog_install_settings
716   sleep 1   sleep 1
717   install_system_settings   install_system_settings
718     dialog_install_initrd
719   install_initrd_chroot   install_initrd_chroot
720    
721   dialog_install_bootsector   dialog_install_bootsector
# Line 790  run_install_auto() Line 733  run_install_auto()
733   dialog_setup_hdd_format   dialog_setup_hdd_format
734   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
735   install_mount_rootfs   install_mount_rootfs
736   (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 | install_meter | dialog_install_system_image
737    
738   dialog_install_settings   dialog_install_settings
739   sleep 1   sleep 1
740   install_system_settings   install_system_settings
741     dialog_install_initrd
742   install_initrd_chroot   install_initrd_chroot
743    
744   dialog_install_bootsector   dialog_install_bootsector

Legend:
Removed from v.2422  
changed lines
  Added in v.2427