diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 09:08:48 (EST) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 09:08:48 (EST) |
| commit | 4ea1459ebbc51e19f7e7e9985db450e521c54681 (patch) | |
| tree | 054e4c1ab326ceffe25516e1871f070f27fc463b | |
| parent | 6e4e840980f3da36b995b0470d18e2e7ecd0a456 (diff) | |
install_system(): Move dir check to installer
Fixes:
prokit: Using architecture i686-linux-glibc
prokit: Using platform libiquity-testbench
prokit: Using mirror http://files.proteanos.com/pub/proteanos
prokit: Clearing MBR and partition table...
prokit: Creating partition table...
prokit: Creating file system...
2 blocks
prokit: Setting up root...
prokit: Error: Directory "/tmp/prokit-2298865601/mount/block-1684450150" exists
| -rw-r--r-- | locale/C.sh | 4 | ||||
| -rw-r--r-- | src/install.sh | 4 | ||||
| -rw-r--r-- | src/installer/chroot.sh | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/locale/C.sh b/locale/C.sh index ee4e237..6d75256 100644 --- a/locale/C.sh +++ b/locale/C.sh @@ -118,6 +118,9 @@ msg_prokit_install_selected_arch='Using architecture %s' msg_prokit_install_selected_plat='Using platform %s' msg_prokit_install_selected_mirror='Using mirror %s' +# src/installer/chroot.sh +msg_prokit_installer_chroot_dir_exists='Directory "%s" exists' + # src/installer/pc.sh msg_prokit_installer_pc_dd='Clearing MBR and partition table...' msg_prokit_installer_pc_dd_fail='Failed to clear MBR and partition table' @@ -128,7 +131,6 @@ msg_prokit_installer_pc_mkfs_fail='Failed to create file system' # src/install.sh msg_prokit_install_setting_up_chroot='Setting up root...' -msg_prokit_install_chroot_dir_exists='Directory "%s" exists' msg_prokit_install_mkdir_chroot_fail='Failed to create directory "%s"' msg_prokit_install_find_pkgs='Configuring opkg and retrieving Packages '\ 'files...' diff --git a/src/install.sh b/src/install.sh index 54d474f..a1deaf9 100644 --- a/src/install.sh +++ b/src/install.sh @@ -325,10 +325,6 @@ install_system() shift 4 info "$(get_msg 'install_setting_up_chroot')" - if [ -d "${root}" ] && ! dir_is_empty "${root}" 'lost+found'; then - error "$(get_msg 'install_chroot_dir_exists')" "${root}" - return 1 - fi if ! mkdir -p -- "${root}/.prokit" "${root}/prokit"; then error "$(get_msg 'install_mkdir_chroot_fail')" "${root}" return 1 diff --git a/src/installer/chroot.sh b/src/installer/chroot.sh index dcdadb4..f4d10a1 100644 --- a/src/installer/chroot.sh +++ b/src/installer/chroot.sh @@ -26,6 +26,11 @@ installer_chroot_main() local foreign="${4}" shift 4 + if [ -d "${root}" ] && ! dir_is_empty "${root}" 'lost+found'; then + error "$(get_msg 'installer_chroot_dir_exists')" "${root}" + return 1 + fi + install_system "${arch}" "${plat}" "${root}" "${foreign}" || return 1 return 0 } |