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 6839 by niro, Thu Jul 23 12:57:23 2015 UTC revision 6844 by niro, Thu Jul 23 13:32:03 2015 UTC
    # Line 44  GRUB2OPTS="" Line 44  GRUB2OPTS=""
    44  GRUB2GFXPAYLOAD=""  GRUB2GFXPAYLOAD=""
    45  FORMFACTOR=""  FORMFACTOR=""
    46  FORMAT_FILESYSTEM=""  FORMAT_FILESYSTEM=""
    47    FORMAT_FILESYSTEM_BOOTHDD=""
    48    FORMAT_FILESYSTEM_ROOTHDD=""
    49  FDISKPARTIONBELOW256MB=0  FDISKPARTIONBELOW256MB=0
    50  SPECIALDEVICE=""  SPECIALDEVICE=""
    51  FLASHDISK=0  FLASHDISK=0
    # Line 164  dialog_setup_system_menu() Line 166  dialog_setup_system_menu()
    166   --ok-label "Weiter" \   --ok-label "Weiter" \
    167   --stdout \   --stdout \
    168   --colors \   --colors \
    169   --menu "\nWaehlen Sie die Installations-Methode" 14 70 5 \   --menu "\nWaehlen Sie die Installations-Methode" 14 70 6 \
    170   "1" "Automatisches Setup (Empfohlen)" \   "1" "Automatisches Setup (Empfohlen)" \
    171   "" "" \   "" "" \
    172   "" "\Z1Experten Modi:\Zn" \   "" "\Z1Experten Modi:\Zn" \
    # Line 179  dialog_setup_system_menu() Line 181  dialog_setup_system_menu()
    181   "1") run_install auto ;;   "1") run_install auto ;;
    182   "2") run_install normal ;;   "2") run_install normal ;;
    183   "3") run_install single ;;   "3") run_install single ;;
    184   "3") run_install flash ;;   "4") run_install flash ;;
    185   "") dialog_setup_system_menu;;   "") dialog_setup_system_menu;;
    186   esac   esac
    187   fi   fi
    # Line 369  dialog_main() Line 371  dialog_main()
    371   --no-cancel \   --no-cancel \
    372   --ok-label "Weiter" \   --ok-label "Weiter" \
    373   --stdout \   --stdout \
    374   --menu "Konfiguration" 14 70 5 \   --menu "Konfiguration" 14 70 6 \
    375   "1" "AutoSta_LX installieren" \   "1" "AutoSta_LX installieren" \
    376   "2" "Uebersicht gefundener Laufwerke" \   "2" "Uebersicht gefundener Laufwerke" \
    377   "3" "Beenden und neustarten" \   "3" "Beenden und neustarten" \
    # Line 588  EOF Line 590  EOF
    590    
    591  setup_hdd_format()  setup_hdd_format()
    592  {  {
    593     install -d /tmp
    594     :> /tmp/format.log
    595    
    596   if [[ -n ${SWAPHDD} ]]   if [[ -n ${SWAPHDD} ]]
    597   then   then
    598   mkswap ${SWAPHDD} || die   mkswap ${SWAPHDD} || die
    599   fi   fi
    600   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    601   then   then
    602   # f2fs is not grub/grub2 compatible   mkfs.${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} &> /tmp/format.log || die
      if [[ ${FORMAT_FILESYSTEM} = f2fs ]]  
      then  
      mkfs.ext2 -q ${BOOTHDD} || die  
      else  
      mkfs.${FORMAT_FILESYSTEM} -q ${BOOTHDD} || die  
      fi  
    603   fi   fi
    604   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    605   then   then
    606   mkfs.${FORMAT_FILESYSTEM} -q ${ROOTHDD} || die   mkfs.${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} &> /tmp/format.log || die
    607   fi   fi
    608  }  }
    609    
    # Line 618  install_mount_rootfs() Line 617  install_mount_rootfs()
    617   fi   fi
    618   if [[ -n ${ROOTHDD} ]]   if [[ -n ${ROOTHDD} ]]
    619   then   then
    620   # be safe here, append file system type to mount   mount -t ${FORMAT_FILESYSTEM_ROOTHDD} ${ROOTHDD} ${INSTALL_ROOT} || die
      # just in case the f2fs module was not autoloaded  
      [[ ${FORMAT_FILESYSTEM} = f2fs ]] && opts="-t fs2fs"  
      mount ${opts} ${ROOTHDD} ${INSTALL_ROOT} || die  
    621   fi   fi
    622   if [[ -n ${BOOTHDD} ]]   if [[ -n ${BOOTHDD} ]]
    623   then   then
    624   install -d ${INSTALL_ROOT}/boot || die   install -d ${INSTALL_ROOT}/boot || die
    625   mount ${BOOTHDD} ${INSTALL_ROOT}/boot || die   mount -t ${FORMAT_FILESYSTEM_BOOTHDD} ${BOOTHDD} ${INSTALL_ROOT}/boot || die
    626   fi   fi
    627    
    628   cd ${INSTALL_ROOT} || die   cd ${INSTALL_ROOT} || die
    # Line 761  install_initrd_chroot() Line 757  install_initrd_chroot()
    757   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    758   is_initrd_supported || return 0   is_initrd_supported || return 0
    759    
    760   FSMODS="${FORMAT_FILESYSTEM}"   FSMODS="${FORMAT_FILESYSTEM_BOOTHDD} ${FORMAT_FILESYSTEM_ROOTHDD}"
    761   DISKMODS="sd_mod"   DISKMODS="sd_mod"
    762   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"   OLDPATAMODS="amd74xx piix sis5513 via82cxxx"
    763   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"   PATAMODS="ata_piix pata_amd pata_mpiix pata_oldpiix pata_sis pata_via"
    # Line 778  install_initrd_chroot() Line 774  install_initrd_chroot()
    774   *) FBMODS="uvesafb" ;;   *) FBMODS="uvesafb" ;;
    775   esac   esac
    776    
      # add a filesystems recoqnized by the bootloader if the current ${FORMAT_FILESYSTEM} is not supported  
      case "${FORMAT_FILESYSTEM}" in  
      f2fs) FSMODS+=" ext2" ;;  
      esac  
       
    777   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    778   then   then
    779   OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"   OTHERMODS="acpi-cpufreq cpufreq_ondemand cpufreq_conservative cpufreq_powersave"
    # Line 867  get_uuid() Line 858  get_uuid()
    858  install_system_settings()  install_system_settings()
    859  {  {
    860   local CONFIG   local CONFIG
    861     local fstype
    862    
    863   # write fstab   # write fstab
    864   CONFIG=${INSTALL_ROOT}/etc/fstab   CONFIG=${INSTALL_ROOT}/etc/fstab
    865   clearconfig   clearconfig
    866   if is_uuid_supported  
    867     if [[ -n ${BOOTHDD} ]]
    868   then   then
    869   if [[ -n ${BOOTHDD} ]]   if is_uuid_supported
      then  
      addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"  
      fi  
      if [[ -n ${ROOTHDD} ]]  
      then  
      addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"  
      fi  
      else  
      if [[ -n ${BOOTHDD} ]]  
    870   then   then
    871   addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM}\tnoatime,noauto\t1 1"   addconfig -e "UUID=$(get_uuid ${BOOTHDD})\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
    872     else
    873     addconfig -e "${BOOTHDD}\t/boot\t${FORMAT_FILESYSTEM_BOOTHDD}\tnoatime,noauto\t1 1"
    874   fi   fi
    875   if [[ -n ${ROOTHDD} ]]   fi
    876    
    877     if [[ -n ${ROOTHDD} ]]
    878     then
    879     if is_uuid_supported
    880   then   then
    881   addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM}\tnoatime\t0 0"   addconfig -e "UUID=$(get_uuid ${ROOTHDD})\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
    882     else
    883     addconfig -e "${ROOTHDD}\t/\t${FORMAT_FILESYSTEM_ROOTHDD}\tnoatime\t0 0"
    884   fi   fi
    885   fi   fi
    886    
    887   # not needed busybox loads all with swapon -a, even if not mentioned in fstab   # not needed busybox loads all with swapon -a, even if not mentioned in fstab
    888   #addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"   #addconfig -e "UUID='$(get_uuid ${SWAPHDD})'\tswap\tswap\tpri=1\t0 0"
    889   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"   addconfig -e "proc\t/proc\tproc\tdefaults\t0 0"
    # Line 953  run_install() Line 946  run_install()
    946    
    947   case "${method}" in   case "${method}" in
    948   auto)   auto)
    949     export FORMAT_FILESYSTEM_BOOTHDD=""
    950     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    951   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    952   ;;   ;;
    953   normal)   normal)
    954     export FORMAT_FILESYSTEM_BOOTHDD="${FORMAT_FILESYSTEM}"
    955     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    956   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    957   ;;   ;;
    958   single)   single)
    959     export FORMAT_FILESYSTEM_BOOTHDD=""
    960     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    961   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    962   ;;   ;;
    963   flash)   flash)
    964   export FORMAT_FILESYSTEM="f2fs"   export FORMAT_FILESYSTEM="f2fs"
    965     export FORMAT_FILESYSTEM_BOOTHDD="ext2"
    966     export FORMAT_FILESYSTEM_ROOTHDD="${FORMAT_FILESYSTEM}"
    967   export INSTALL_METHOD="${method}"   export INSTALL_METHOD="${method}"
    968   ;;   ;;
    969   *)   *)
    970   echo "Unknown install method '${method}', aborting."   die "Unknown install method '${method}', aborting."
      exit 1  
    971   ;;   ;;
    972   esac   esac
    973    
    Legend:
    Removed from v.6839  
    changed lines
      Added in v.6844