Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/installer-simple/bin/installer.sh.in

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

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

    revision 2444 by niro, Tue Jan 7 14:53:46 2014 UTC revision 2471 by niro, Tue Jan 7 20:55:50 2014 UTC
    # Line 113  dialog_setup_hdd_info() Line 113  dialog_setup_hdd_info()
    113   local SHDD="${HDD//\/dev\/}"   local SHDD="${HDD//\/dev\/}"
    114    
    115   messagebox -h $"[ Harddrive partitioning ]" \   messagebox -h $"[ Harddrive partitioning ]" \
    116   $"\nPlease create 1 partition.\n\n\[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace\n\Please mark ${SHDD}1 \Z3bootable\Zn."   $"Please create 1 partition.\n\n[ \Z3${SHDD}1\Zn ] type: \Z3linux\Zn with the whole diskspace.\nPlease mark ${SHDD}1 \Z3bootable\Zn."
    117  }  }
    118    
    119  dialog_setup_hdd_info_auto()  dialog_setup_hdd_info_auto()
    # Line 180  dialog_hardware_detection() Line 180  dialog_hardware_detection()
    180   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;   zotac*) message+=$"\n\Z2Zotac device detected.\Zn" ;;
    181   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;   rangee) message+=$"\n\Z2Rangee device detected.\Zn" ;;
    182   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;   maxdata) message+=$"\n\Z2Maxdata device detected.\Zn" ;;
    183   *) message+=$"\n \\ZnCommon device detected.\Zn" ;;   *) message+=$"\n\ZnCommon device detected.\Zn" ;;
    184   esac   esac
    185   if [[ ${FORMFACTOR} = laptop ]]   if [[ ${FORMFACTOR} = laptop ]]
    186   then   then
    187   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving  mode.\Zn"   message+=$"\n\ZnFormfactor Laptop, activating 'ondemand' powersaving mode.\Zn"
    188   fi   fi
    189    
    190   messagebox -y 15 -h $"Detected hardware:" "${message}"   messagebox -y 12 -h $"Detected hardware:" "${message}"
    191  }  }
    192    
    193  dialog_setup_hdd_partitions_manual()  dialog_setup_hdd_partitions_manual()
    # Line 253  dialog_main() Line 253  dialog_main()
    253    
    254   while [[ ${method} -le 2 ]]   while [[ ${method} -le 2 ]]
    255   do   do
    256   method=$(menubox $"Configuration:" \   method=$(CANCEL_LABEL=$"Exit" menubox $"Configuration:" \
    257   $"1:Install system" \   $"1:Install system" \
    258   $"2:Show detected harddrives" \   $"2:Show detected harddrives" \
    259   $"3:Exit and reboot" \   $"3:Exit and reboot" \
    # Line 468  install_system_image() Line 468  install_system_image()
    468   popd > /dev/null   popd > /dev/null
    469  }  }
    470    
    471  install_bootsector_chroot()  disabled_install_bootsector_chroot()
    472  {  {
    473   local my_roothdd   local my_roothdd
    474   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"   local grubconf="${INSTALLROOT}/boot/grub/grub.conf"
    # Line 573  CHROOTEOF Line 573  CHROOTEOF
    573   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    574  }  }
    575    
    576  install_initrd_chroot()  disabled_install_initrd_chroot()
    577  {  {
    578   # only generate initrds if the cmd exists   # only generate initrds if the cmd exists
    579   is_initrd_supported || return 0   is_initrd_supported || return 0
    Legend:
    Removed from v.2444  
    changed lines
      Added in v.2471