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 2436 by niro, Tue Jan 7 14:25:34 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 555  exit 0 Line 569  exit 0
    569  CHROOTEOF  CHROOTEOF
    570   fi   fi
    571    
    572   ## enter chroot   # run installrc
    573   mount -t proc proc ${INSTALLROOT}/proc   chrooted /bin/bash --rcfile /root/.installrc -i
      mount -t sysfs sysfs ${INSTALLROOT}/sys  
      mount -o bind /dev ${INSTALLROOT}/dev  
      chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i  
      umount ${INSTALLROOT}/proc  
      umount ${INSTALLROOT}/sys  
      umount ${INSTALLROOT}/dev  
    574   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    575  }  }
    576    
    # Line 615  mkinitrd -f /boot/$(readlink /boot/initr Line 623  mkinitrd -f /boot/$(readlink /boot/initr
    623  exit 0  exit 0
    624  CHROOTEOF  CHROOTEOF
    625    
    626   ## enters chroot   # run installrc
    627   mount -t proc proc ${INSTALLROOT}/proc   chrooted /bin/bash --rcfile /root/.installrc -i
      mount -t sysfs sysfs ${INSTALLROOT}/sys  
      mount -o bind /dev ${INSTALLROOT}/dev  
      chroot ${INSTALLROOT} /bin/bash --rcfile /root/.installrc -i  
      umount ${INSTALLROOT}/proc  
      umount ${INSTALLROOT}/sys  
      umount ${INSTALLROOT}/dev  
    628   rm ${INSTALLROOT}/root/.installrc   rm ${INSTALLROOT}/root/.installrc
    629  }  }
    630    
    # Line 692  install_system_settings() Line 694  install_system_settings()
    694    
    695  install_umount_rootfs()  install_umount_rootfs()
    696  {  {
    697   umount ${INSTALLROOT}/boot || dialog_die   is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot
    698   umount ${INSTALLROOT} || dialog_die   is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT}
    699  }  }
    700    
    701  install_do_reboot()  install_do_reboot()
    Legend:
    Removed from v.2434  
    changed lines
      Added in v.2436