--- trunk/installer-simple/bin/installer.sh.in 2014/01/08 10:38:40 2484 +++ trunk/installer-simple/bin/installer.sh.in 2014/01/08 10:40:59 2485 @@ -100,13 +100,13 @@ return 0 } -install_mount_rootfs() +mount_rootfs() { is_mounted --location "${INSTALLROOT}" || mount "${ROOTHDD}" "${INSTALLROOT}" install -d ${INSTALLROOT}/boot || dialog_die } -install_umount_rootfs() +umount_rootfs() { is_mounted --location ${INSTALLROOT}/boot && umount ${INSTALLROOT}/boot is_mounted --location ${INSTALLROOT} && umount ${INSTALLROOT} @@ -482,7 +482,7 @@ task_setup_hdd_partitions_manual dialog_setup_hdd_format setup_hdd_format > /dev/null - install_mount_rootfs + mount_rootfs (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image dialog_install_settings @@ -499,7 +499,7 @@ bootloader_config bootloader_install - install_umount_rootfs + umount_rootfs dialog_install_successful } @@ -510,7 +510,7 @@ task_setup_hdd_partitions_auto dialog_setup_hdd_format setup_hdd_format > /dev/null - install_mount_rootfs + mount_rootfs (install_system_image > /tmp/install.log) 2> /tmp/install_errors.log | install_meter | dialog_install_system_image dialog_install_settings @@ -527,7 +527,7 @@ bootloader_config bootloader_install - install_umount_rootfs + umount_rootfs dialog_install_successful }