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 6771 by niro, Tue Jul 21 12:26:10 2015 UTC revision 6815 by niro, Thu Jul 23 08:26:38 2015 UTC
    # Line 11  Line 11 
    11  # Install Navigation Gui  # Install Navigation Gui
    12  #  #
    13    
    14    # ignore environment!
    15    LC_ALL=C
    16    
    17  #images: (get ${CDIMAGENAME})  #images: (get ${CDIMAGENAME})
    18  source /mnt/cdrom/system/images.conf  source /mnt/cdrom/system/images.conf
    19    
    # Line 95  dialog_setup_hdd_info() Line 98  dialog_setup_hdd_info()
    98   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81   Bitte ${SHDD}1 als \Z3bootable\Zn markieren." 12 81
    99  }  }
    100    
    101  dialog_setup_hdd_info_flash()  dialog_setup_hdd_info_simple()
    102  {  {
    103   local SHDD="$(echo $HDD | sed 's/\/dev\///')"   local SHDD="$(echo $HDD | sed 's/\/dev\///')"
    104    
    # Line 146  dialog_setup_system_menu() Line 149  dialog_setup_system_menu()
    149   case "${i}" in   case "${i}" in
    150   "1") run_install_auto ;;   "1") run_install_auto ;;
    151   "2") run_install_normal ;;   "2") run_install_normal ;;
    152   "3") run_install_flash ;;   "3") run_install_simple ;;
    153   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    154   esac   esac
    155   fi   fi
    # Line 268  dialog_setup_hdd_partitions_manuell() Line 271  dialog_setup_hdd_partitions_manuell()
    271   fi   fi
    272  }  }
    273    
    274  dialog_setup_hdd_partitions_manuell_flash()  dialog_setup_hdd_partitions_manuell_simple()
    275  {  {
    276   local i   local i
    277    
    # Line 300  dialog_setup_hdd_partitions_manuell_flas Line 303  dialog_setup_hdd_partitions_manuell_flas
    303   [[ ${RES} -eq 1 ]] && return 1   [[ ${RES} -eq 1 ]] && return 1
    304   if [[ ${RES} -eq 0 ]]   if [[ ${RES} -eq 0 ]]
    305   then   then
    306   dialog_setup_hdd_info_flash   dialog_setup_hdd_info_simple
    307   setup_hdd_partitions_manuell_flash   setup_hdd_partitions_manuell_simple
    308   fi   fi
    309   fi   fi
    310  }  }
    # Line 610  setup_hdd_partitions_manuell() Line 613  setup_hdd_partitions_manuell()
    613   cfdisk ${HDD} || die   cfdisk ${HDD} || die
    614  }  }
    615    
    616  setup_hdd_partitions_manuell_flash()  setup_hdd_partitions_manuell_simple()
    617  {  {
    618   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    619    
    # Line 625  setup_hdd_format() Line 628  setup_hdd_format()
    628   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    629  }  }
    630    
    631  setup_hdd_format_flash()  setup_hdd_format_simple()
    632  {  {
    633   mke2fs -j -q ${ROOTHDD} || die   mke2fs -j -q ${ROOTHDD} || die
    634  }  }
    # Line 639  install_mount_rootfs() Line 642  install_mount_rootfs()
    642   cd ${INSTALLPATH} || die   cd ${INSTALLPATH} || die
    643  }  }
    644    
    645  install_mount_rootfs_flash()  install_mount_rootfs_simple()
    646  {  {
    647   mount ${ROOTHDD} ${INSTALLPATH} || die   mount ${ROOTHDD} ${INSTALLPATH} || die
    648   install -d ${INSTALLPATH}/boot || die   install -d ${INSTALLPATH}/boot || die
    # Line 891  install_system_settings() Line 894  install_system_settings()
    894   fi   fi
    895  }  }
    896    
    897  install_system_settings_flash()  install_system_settings_simple()
    898  {  {
    899   # schreibe fstab   # schreibe fstab
    900   if is_uuid_supported   if is_uuid_supported
    # Line 912  install_umount_rootfs() Line 915  install_umount_rootfs()
    915   swapoff ${SWAPHDD} || die   swapoff ${SWAPHDD} || die
    916  }  }
    917    
    918  install_umount_rootfs_flash()  install_umount_rootfs_simple()
    919  {  {
    920   cd /   cd /
    921   umount ${INSTALLPATH} || die   umount ${INSTALLPATH} || die
    # Line 949  run_install_normal() Line 952  run_install_normal()
    952   dialog_install_successful   dialog_install_successful
    953  }  }
    954    
    955  run_install_flash()  run_install_simple()
    956  {  {
    957   dialog_hardware_detection   dialog_hardware_detection
    958    
    959   dialog_setup_hdd_partitions_manuell_flash   dialog_setup_hdd_partitions_manuell_simple
    960   dialog_setup_hdd_format   dialog_setup_hdd_format
    961   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
    962   install_mount_rootfs_flash   install_mount_rootfs_simple
    963   (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
    964    
    965   dialog_install_settings   dialog_install_settings
    966   sleep 1   sleep 1
    967   install_system_settings_flash   install_system_settings_simple
    968   install_initrd_chroot   install_initrd_chroot
    969    
    970   dialog_install_bootsector   dialog_install_bootsector
    971   install_bootsector_chroot   install_bootsector_chroot
    972    
    973   install_umount_rootfs_flash   install_umount_rootfs_simple
    974   dialog_install_successful   dialog_install_successful
    975  }  }
    976    
    # Line 977  run_install_auto() Line 980  run_install_auto()
    980    
    981   dialog_setup_hdd_partitions_auto   dialog_setup_hdd_partitions_auto
    982   dialog_setup_hdd_format   dialog_setup_hdd_format
    983   setup_hdd_format_flash > /dev/null   setup_hdd_format_simple > /dev/null
    984   install_mount_rootfs_flash   install_mount_rootfs_simple
    985   (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
    986    
    987   dialog_install_settings   dialog_install_settings
    988   sleep 1   sleep 1
    989   install_system_settings_flash   install_system_settings_simple
    990   install_initrd_chroot   install_initrd_chroot
    991    
    992   dialog_install_bootsector   dialog_install_bootsector
    993   install_bootsector_chroot   install_bootsector_chroot
    994    
    995   install_umount_rootfs_flash   install_umount_rootfs_simple
    996   dialog_install_successful   dialog_install_successful
    997  }  }
    998    
    Legend:
    Removed from v.6771  
    changed lines
      Added in v.6815