Magellan Linux

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

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

revision 2424 by niro, Tue Jan 7 13:56:51 2014 UTC revision 2428 by niro, Tue Jan 7 14:11:12 2014 UTC
# Line 27  for inc in %SYSCONFDIR%/installer.conf \ Line 27  for inc in %SYSCONFDIR%/installer.conf \
27   ${INSTALLER_LIBDIR}/functions/common.sh \   ${INSTALLER_LIBDIR}/functions/common.sh \
28   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \   ${INSTALLER_LIBDIR}/functions/common-dialogs.sh \
29   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \   ${INSTALLER_LIBDIR}/functions/hwdetection.sh \
30     ${INSTALLER_LIBDIR}/functions/bootloader.sh \
31     ${INSTALLER_LIBDIR}/functions/initrd-tools.sh \
32   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh   ${INSTALLER_LIBDIR}/functions/installer-dialogs.sh
33  do  do
34   if [ -e ${inc} ]   if [ -e ${inc} ]
# Line 246  run_hardware_detection_disks() Line 248  run_hardware_detection_disks()
248   export ALL_CDROMS="$(get_hwinfo cdrom)"   export ALL_CDROMS="$(get_hwinfo cdrom)"
249  }  }
250    
 dialog_setup_hdd_create_partitions()  
 {  
  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  
 }  
   
251  install_meter()  install_meter()
252  {  {
253   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]   while [[ ${CURRENTLINE} != ${TOTALLINES} ]]
# Line 287  install_meter() Line 261  install_meter()
261   return 0   return 0
262  }  }
263    
   
 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  
 }  
   
264  dialog_main()  dialog_main()
265  {  {
266   local method=0   local method=0
# Line 320  dialog_main() Line 268  dialog_main()
268    
269   while [[ ${method} -le 2 ]]   while [[ ${method} -le 2 ]]
270   do   do
271   method=$(dialog \   method=$(menubox $"Configuration:" \
272   --backtitle "${TITLE}" \   $"1:Install system" \
273   --no-cancel \   $"2:Show detected harddrives" \
274   --ok-label "Weiter" \   $"3:Exit and reboot" \
275   --stdout \   $"4:Exit and drop into a shell")
  --menu "Konfiguration" 14 70 5 \  
  "1" "AutoSta_LX installieren" \  
  "2" "Uebersicht gefundener Laufwerke" \  
  "3" "Beenden und neustarten" \  
  "4" "Beenden und eine Shell starten")  
276   retval=$?   retval=$?
277   [[ ${retval} -eq 1 ]] && exit 1   [[ ${retval} -eq 1 ]] && exit 1
278   if [[ ${retval} -eq 0 ]]   if [[ ${retval} -eq 0 ]]
# Line 774  run_install_normal() Line 717  run_install_normal()
717   dialog_install_settings   dialog_install_settings
718   sleep 1   sleep 1
719   install_system_settings   install_system_settings
720     dialog_install_initrd
721   install_initrd_chroot   install_initrd_chroot
722    
723   dialog_install_bootsector   dialog_install_bootsector
# Line 796  run_install_auto() Line 740  run_install_auto()
740   dialog_install_settings   dialog_install_settings
741   sleep 1   sleep 1
742   install_system_settings   install_system_settings
743     dialog_install_initrd
744   install_initrd_chroot   install_initrd_chroot
745    
746   dialog_install_bootsector   dialog_install_bootsector

Legend:
Removed from v.2424  
changed lines
  Added in v.2428