--- trunk/installer-simple/bin/installer.sh.in 2014/01/08 10:36:44 2483 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/08 10:38:40 2484 @@ -100,6 +100,23 @@ return 0 } +install_mount_rootfs() +{ + is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}" + install -d ${INSTALLROOT}/boot || dialog_die +} + +install_umount_rootfs() +{ + is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot + is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT} +} + +install_do_reboot() +{ + reboot +} + run_hardware_detection() { local hwinfo @@ -262,12 +279,6 @@ mkfs."${FORMAT_FILESYSTEM}" -q "${ROOTHDD}" || dialog_die } -install_mount_rootfs() -{ - is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}" - install -d ${INSTALLROOT}/boot || dialog_die -} - install_system_image() { pushd ${INSTALLROOT} > /dev/null @@ -309,17 +320,6 @@ fi } -install_umount_rootfs() -{ - is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot - is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT} -} - -install_do_reboot() -{ - reboot -} - ### installer dialogs ###