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 6822 by niro, Thu Jul 23 08:57:29 2015 UTC revision 6823 by niro, Thu Jul 23 09:31:04 2015 UTC
    # Line 87  dialog_setup_hdd_info() Line 87  dialog_setup_hdd_info()
    87   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    88  }  }
    89    
    90  dialog_setup_hdd_info_simple()  dialog_setup_hdd_info_single()
    91  {  {
    92   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    93    
    # Line 138  dialog_setup_system_menu() Line 138  dialog_setup_system_menu()
    138   case "${i}" in   case "${i}" in
    139   "1") run_install_auto ;;   "1") run_install_auto ;;
    140   "2") run_install_normal ;;   "2") run_install_normal ;;
    141   "3") run_install_simple ;;   "3") run_install_single ;;
    142   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    143   esac   esac
    144   fi   fi
    # Line 247  dialog_setup_hdd_partitions_manuell() Line 247  dialog_setup_hdd_partitions_manuell()
    247   fi   fi
    248  }  }
    249    
    250  dialog_setup_hdd_partitions_manuell_simple()  dialog_setup_hdd_partitions_manuell_single()
    251  {  {
    252   local i   local i
    253    
    # Line 279  dialog_setup_hdd_partitions_manuell_simp Line 279  dialog_setup_hdd_partitions_manuell_simp
    279   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    280   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    281   then   then
    282   dialog_setup_hdd_info_simple   dialog_setup_hdd_info_single
    283   setup_hdd_partitions_manuell_simple   setup_hdd_partitions_manuell_single
    284   fi   fi
    285   fi   fi
    286  }  }
    # Line 602  setup_hdd_partitions_manuell() Line 602  setup_hdd_partitions_manuell()
    602   cfdisk ${HDD} || die   cfdisk ${HDD} || die
    603  }  }
    604    
    605  setup_hdd_partitions_manuell_simple()  setup_hdd_partitions_manuell_single()
    606  {  {
    607   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    608    
    # Line 617  setup_hdd_format() Line 617  setup_hdd_format()
    617   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    618  }  }
    619    
    620  setup_hdd_format_simple()  setup_hdd_format_single()
    621  {  {
    622   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    623  }  }
    # Line 631  install_mount_rootfs() Line 631  install_mount_rootfs()
    631   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || die
    632  }  }
    633    
    634  install_mount_rootfs_simple()  install_mount_rootfs_single()
    635  {  {
    636   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALLPATH} || die
    637   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALLPATH}/boot || die
    # Line 883  install_system_settings() Line 883  install_system_settings()
    883   fi   fi
    884  }  }
    885    
    886  install_system_settings_simple()  install_system_settings_single()
    887  {  {
    888   # write fstab   # write fstab
    889   if is_uuid_supported   if is_uuid_supported
    # Line 904  install_umount_rootfs() Line 904  install_umount_rootfs()
    904   swapoff ${SWAPHDD} || die   swapoff ${SWAPHDD} || die
    905  }  }
    906    
    907  install_umount_rootfs_simple()  install_umount_rootfs_single()
    908  {  {
    909   cd /   cd /
    910   umount ${INSTALLPATH} || die   umount ${INSTALLPATH} || die
    # Line 941  run_install_normal() Line 941  run_install_normal()
    941   dialog_install_successful   dialog_install_successful
    942  }  }
    943    
    944  run_install_simple()  run_install_single()
    945  {  {
    946   dialog_hardware_detection   dialog_hardware_detection
    947    
    948   dialog_setup_hdd_partitions_manuell_simple   dialog_setup_hdd_partitions_manuell_single
    949   dialog_setup_hdd_format   dialog_setup_hdd_format
    950   setup_hdd_format_simple > /dev/null   setup_hdd_format_single > /dev/null
    951   install_mount_rootfs_simple   install_mount_rootfs_single
    952   (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
    953    
    954   dialog_install_settings   dialog_install_settings
    955   sleep 1   sleep 1
    956   install_system_settings_simple   install_system_settings_single
    957   install_initrd_chroot   install_initrd_chroot
    958    
    959   dialog_install_bootsector   dialog_install_bootsector
    960   install_bootsector_chroot   install_bootsector_chroot
    961    
    962   install_umount_rootfs_simple   install_umount_rootfs_single
    963   dialog_install_successful   dialog_install_successful
    964  }  }
    965    
    # Line 969  run_install_auto() Line 969  run_install_auto()
    969    
    970   dialog_setup_hdd_partitions_auto   dialog_setup_hdd_partitions_auto
    971   dialog_setup_hdd_format   dialog_setup_hdd_format
    972   setup_hdd_format_simple > /dev/null   setup_hdd_format_single > /dev/null
    973   install_mount_rootfs_simple   install_mount_rootfs_single
    974   (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
    975    
    976   dialog_install_settings   dialog_install_settings
    977   sleep 1   sleep 1
    978   install_system_settings_simple   install_system_settings_single
    979   install_initrd_chroot   install_initrd_chroot
    980    
    981   dialog_install_bootsector   dialog_install_bootsector
    982   install_bootsector_chroot   install_bootsector_chroot
    983    
    984   install_umount_rootfs_simple   install_umount_rootfs_single
    985   dialog_install_successful   dialog_install_successful
    986  }  }
    987    
    Legend:
    Removed from v.6822  
    changed lines
      Added in v.6823