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 2434 by niro, Tue Jan 7 14:20:31 2014 UTC revision 2435 by niro, Tue Jan 7 14:23:24 2014 UTC
    # Line 370  setup_hdd_partitions_auto() Line 370  setup_hdd_partitions_auto()
    370  {  {
    371   ROOTHDD="${HDD}1"   ROOTHDD="${HDD}1"
    372    
    373     # sanity check - should not happen
    374     if is_mounted --device "${ROOTHDD}"
    375     then
    376     echo "partition: device ${ROOTHDD} is already mounted, umount it" >&2
    377     umount "${ROOTHDD}"
    378     fi
    379    
    380   # run this only if FDISKPARTITIONBELOW256MB is not already 1   # run this only if FDISKPARTITIONBELOW256MB is not already 1
    381   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]   if [[ ${FDISKPARTIONBELOW256MB} != 1 ]]
    382   then   then
    # Line 438  setup_hdd_partitions_manual() Line 445  setup_hdd_partitions_manual()
    445    
    446  setup_hdd_format()  setup_hdd_format()
    447  {  {
    448     # sanity check - should not happen
    449     if is_mounted --device "${ROOTHDD}"
    450     then
    451     echo "format: device ${ROOTHDD} is already mounted, umount it" >&2
    452     umount "${ROOTHDD}"
    453     fi
    454    
    455   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die   mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die
    456  }  }
    457    
    458  install_mount_rootfs()  install_mount_rootfs()
    459  {  {
    460   mount ${ROOTHDD} ${INSTALLROOT} || dialog_die   is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}"
    461   install -d ${INSTALLROOT}/boot || dialog_die   install -d ${INSTALLROOT}/boot || dialog_die
    462  }  }
    463    
    # Line 692  install_system_settings() Line 706  install_system_settings()
    706    
    707  install_umount_rootfs()  install_umount_rootfs()
    708  {  {
    709   umount ${INSTALLROOT}/boot || dialog_die   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    710   umount ${INSTALLROOT} || dialog_die   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
    711  }  }
    712    
    713  install_do_reboot()  install_do_reboot()
    Legend:
    Removed from v.2434  
    changed lines
      Added in v.2435