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 2489 by niro, Wed Jan 8 12:14:37 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}"   local retval
    106   install -d ${INSTALLROOT}/boot || dialog_die  
    107     if is_mounted --location "${INSTALLROOT}"
    108     then
    109     echo $"${INSTALLROOT} already mounted" >&2
    110     else
    111     mount "${ROOTHDD}" "${INSTALLROOT}" || dialog_die $"Could not mount rootfs - drive'${ROOTHDD}' -> '${INSTALLROOT}'"
    112     fi
    113     [[ -d ${INSTALLROOT}/boot ]] || install -d ${INSTALLROOT}/boot
    114  }  }
    115    
    116  install_umount_rootfs()  umount_rootfs()
    117  {  {
    118   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    119   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
    # Line 482  run_install_normal() Line 489  run_install_normal()
    489   task_setup_hdd_partitions_manual   task_setup_hdd_partitions_manual
    490   dialog_setup_hdd_format   dialog_setup_hdd_format
    491   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    492   install_mount_rootfs   mount_rootfs
    493   (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
    494    
    495   dialog_install_settings   dialog_install_settings
    # Line 499  run_install_normal() Line 506  run_install_normal()
    506   bootloader_config   bootloader_config
    507   bootloader_install   bootloader_install
    508    
    509   install_umount_rootfs   umount_rootfs
    510   dialog_install_successful   dialog_install_successful
    511  }  }
    512    
    # Line 510  run_install_auto() Line 517  run_install_auto()
    517   task_setup_hdd_partitions_auto   task_setup_hdd_partitions_auto
    518   dialog_setup_hdd_format   dialog_setup_hdd_format
    519   setup_hdd_format > /dev/null   setup_hdd_format > /dev/null
    520   install_mount_rootfs   mount_rootfs
    521   (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
    522    
    523   dialog_install_settings   dialog_install_settings
    # Line 527  run_install_auto() Line 534  run_install_auto()
    534   bootloader_config   bootloader_config
    535   bootloader_install   bootloader_install
    536    
    537   install_umount_rootfs   umount_rootfs
    538   dialog_install_successful   dialog_install_successful
    539  }  }
    540    
    Legend:
    Removed from v.2484  
    changed lines
      Added in v.2489