Magellan Linux

  • Back to homepage
    • /[alx-svn]/alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

    Diff of /alx-src/trunk/alxinstall-ng/bin/alxinstall-ng.sh.in

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

    revision 6798 by niro, Tue Jul 21 12:26:10 2015 UTC revision 6799 by niro, Wed Jul 22 11:08:40 2015 UTC
    # Line 95  dialog_setup_hdd_info() Line 95  dialog_setup_hdd_info()
    95   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    96  }  }
    97    
    98  dialog_setup_hdd_info_flash()  dialog_setup_hdd_info_simple()
    99  {  {
    100   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    101    
    # Line 146  dialog_setup_system_menu() Line 146  dialog_setup_system_menu()
    146   case "${i}" in   case "${i}" in
    147   "1") run_install_auto ;;   "1") run_install_auto ;;
    148   "2") run_install_normal ;;   "2") run_install_normal ;;
    149   "3") run_install_flash ;;   "3") run_install_simple ;;
    150   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    151   esac   esac
    152   fi   fi
    # Line 268  dialog_setup_hdd_partitions_manuell() Line 268  dialog_setup_hdd_partitions_manuell()
    268   fi   fi
    269  }  }
    270    
    271  dialog_setup_hdd_partitions_manuell_flash()  dialog_setup_hdd_partitions_manuell_simple()
    272  {  {
    273   local i   local i
    274    
    # Line 300  dialog_setup_hdd_partitions_manuell_flas Line 300  dialog_setup_hdd_partitions_manuell_flas
    300   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    301   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    302   then   then
    303   dialog_setup_hdd_info_flash   dialog_setup_hdd_info_simple
    304   setup_hdd_partitions_manuell_flash   setup_hdd_partitions_manuell_simple
    305   fi   fi
    306   fi   fi
    307  }  }
    # Line 610  setup_hdd_partitions_manuell() Line 610  setup_hdd_partitions_manuell()
    610   cfdisk ${HDD} || die   cfdisk ${HDD} || die
    611  }  }
    612    
    613  setup_hdd_partitions_manuell_flash()  setup_hdd_partitions_manuell_simple()
    614  {  {
    615   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    616    
    # Line 625  setup_hdd_format() Line 625  setup_hdd_format()
    625   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    626  }  }
    627    
    628  setup_hdd_format_flash()  setup_hdd_format_simple()
    629  {  {
    630   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    631  }  }
    # Line 639  install_mount_rootfs() Line 639  install_mount_rootfs()
    639   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || die
    640  }  }
    641    
    642  install_mount_rootfs_flash()  install_mount_rootfs_simple()
    643  {  {
    644   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALLPATH} || die
    645   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALLPATH}/boot || die
    # Line 891  install_system_settings() Line 891  install_system_settings()
    891   fi   fi
    892  }  }
    893    
    894  install_system_settings_flash()  install_system_settings_simple()
    895  {  {
    896   # schreibe fstab   # schreibe fstab
    897   if is_uuid_supported   if is_uuid_supported
    # Line 912  install_umount_rootfs() Line 912  install_umount_rootfs()
    912   swapoff ${SWAPHDD} || die   swapoff ${SWAPHDD} || die
    913  }  }
    914    
    915  install_umount_rootfs_flash()  install_umount_rootfs_simple()
    916  {  {
    917   cd /   cd /
    918   umount ${INSTALLPATH} || die   umount ${INSTALLPATH} || die
    # Line 949  run_install_normal() Line 949  run_install_normal()
    949   dialog_install_successful   dialog_install_successful
    950  }  }
    951    
    952  run_install_flash()  run_install_simple()
    953  {  {
    954   dialog_hardware_detection   dialog_hardware_detection
    955    
    956   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_simple
    957   dialog_setup_hdd_format   dialog_setup_hdd_format
    958   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
    959   install_mount_rootfs_flash   install_mount_rootfs_simple
    960   (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
    961    
    962   dialog_install_settings   dialog_install_settings
    963   sleep 1   sleep 1
    964   install_system_settings_flash   install_system_settings_simple
    965   install_initrd_chroot   install_initrd_chroot
    966    
    967   dialog_install_bootsector   dialog_install_bootsector
    968   install_bootsector_chroot   install_bootsector_chroot
    969    
    970   install_umount_rootfs_flash   install_umount_rootfs_simple
    971   dialog_install_successful   dialog_install_successful
    972  }  }
    973    
    # Line 977  run_install_auto() Line 977  run_install_auto()
    977    
    978   dialog_setup_hdd_partitions_auto   dialog_setup_hdd_partitions_auto
    979   dialog_setup_hdd_format   dialog_setup_hdd_format
    980   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
    981   install_mount_rootfs_flash   install_mount_rootfs_simple
    982   (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
    983    
    984   dialog_install_settings   dialog_install_settings
    985   sleep 1   sleep 1
    986   install_system_settings_flash   install_system_settings_simple
    987   install_initrd_chroot   install_initrd_chroot
    988    
    989   dialog_install_bootsector   dialog_install_bootsector
    990   install_bootsector_chroot   install_bootsector_chroot
    991    
    992   install_umount_rootfs_flash   install_umount_rootfs_simple
    993   dialog_install_successful   dialog_install_successful
    994  }  }
    995    
    Legend:
    Removed from v.6798  
    changed lines
      Added in v.6799