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 2484 by niro, Wed Jan 8 10:38:40 2014 UTC revision 2485 by niro, Wed Jan 8 10:40:59 2014 UTC
    # Line 100  install_meter() Line 100  install_meter()
    100   return 0   return 0
    101  }  }
    102    
    103  install_mount_rootfs()  mount_rootfs()
    104  {  {
    105   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
    106   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
    107  }  }
    108    
    109  install_umount_rootfs()  umount_rootfs()
    110  {  {
    111   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    112   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
    # Line 482  run_install_normal() Line 482  run_install_normal()
    482   task_setup_hdd_partitions_manual   task_setup_hdd_partitions_manual
    483   dialog_setup_hdd_format   dialog_setup_hdd_format
    484   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    485   install_mount_rootfs   mount_rootfs
    486   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
    487    
    488   dialog_install_settings   dialog_install_settings
    # Line 499  run_install_normal() Line 499  run_install_normal()
    499   bootloader_config   bootloader_config
    500   bootloader_install   bootloader_install
    501    
    502   install_umount_rootfs   umount_rootfs
    503   dialog_install_successful   dialog_install_successful
    504  }  }
    505    
    # Line 510  run_install_auto() Line 510  run_install_auto()
    510   task_setup_hdd_partitions_auto   task_setup_hdd_partitions_auto
    511   dialog_setup_hdd_format   dialog_setup_hdd_format
    512   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    513   install_mount_rootfs   mount_rootfs
    514   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image   (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image
    515    
    516   dialog_install_settings   dialog_install_settings
    # Line 527  run_install_auto() Line 527  run_install_auto()
    527   bootloader_config   bootloader_config
    528   bootloader_install   bootloader_install
    529    
    530   install_umount_rootfs   umount_rootfs
    531   dialog_install_successful   dialog_install_successful
    532  }  }
    533    
    Legend:
    Removed from v.2484  
    changed lines
      Added in v.2485