diff options
| -rw-r--r-- | locale/C.sh | 19 | ||||
| -rw-r--r-- | src/installer/pc.sh | 14 |
2 files changed, 15 insertions, 18 deletions
diff --git a/locale/C.sh b/locale/C.sh index d3f5906..d1891c4 100644 --- a/locale/C.sh +++ b/locale/C.sh @@ -103,17 +103,6 @@ msg_prokit_cmd_build_summary='build a package' msg_prokit_cmd_build_usage='<root> [-l] [<option> ...] <pkg-dir>' msg_prokit_cmd_build_not_a_dir='Not a directory: %s' -# src/cmd/installer-pc.sh -msg_prokit_cmd_installer_pc_summary='install a PC system onto a block device' -msg_prokit_cmd_installer_pc_usage='-a <arch> -p <plat> [-m <mirror>] [-F] '\ -'<suite> <device>' -msg_prokit_cmd_installer_pc_dd='Clearing MBR and partition table...' -msg_prokit_cmd_installer_pc_dd_fail='Failed to clear MBR and partition table' -msg_prokit_cmd_installer_pc_fdisk='Creating partition table...' -msg_prokit_cmd_installer_pc_fdisk_fail='Failed to create partition table' -msg_prokit_cmd_installer_pc_mkfs='Creating file system...' -msg_prokit_cmd_installer_pc_mkfs_fail='Failed to create file system' - # src/cmd/mkinitramfs.sh msg_prokit_cmd_mkinitramfs_summary='generate an initramfs containing an '\ 'installed system' @@ -136,6 +125,14 @@ 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/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' +msg_prokit_installer_pc_fdisk='Creating partition table...' +msg_prokit_installer_pc_fdisk_fail='Failed to create partition table' +msg_prokit_installer_pc_mkfs='Creating file system...' +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' diff --git a/src/installer/pc.sh b/src/installer/pc.sh index 157894d..ce1b898 100644 --- a/src/installer/pc.sh +++ b/src/installer/pc.sh @@ -38,33 +38,33 @@ _installer_pc_make_partition_and_fs() shift 1 local log= - info "$(get_msg 'cmd_installer_pc_dd')" + info "$(get_msg 'installer_pc_dd')" if ! log="$(dd if=/dev/zero of="${dev}" bs=512 count=1 2>&1)"; then - error "$(get_msg 'cmd_installer_pc_dd_fail')" + error "$(get_msg 'installer_pc_dd_fail')" _installer_pc_log_print 'dd' "${log}" return 1 fi - info "$(get_msg 'cmd_installer_pc_fdisk')" + info "$(get_msg 'installer_pc_fdisk')" if ${HAVE_SFDISK}; then if ! log="$(printf ',,83,*\n' | ${SFDISK} -- "${dev}" 2>&1)" then - error "$(get_msg 'cmd_installer_pc_fdisk_fail')" + error "$(get_msg 'installer_pc_fdisk_fail')" _installer_pc_log_print 'sfdisk' "${log}" return 1 fi elif ${HAVE_FDISK}; then if ! log="$(printf 'n\np\n1\n\n\nt\n83\na\n1\nw\n' | ${FDISK} -- "${dev}" 2>&1)"; then - error "$(get_msg 'cmd_installer_pc_fdisk_fail')" + error "$(get_msg 'installer_pc_fdisk_fail')" _installer_pc_log_print 'fdisk' "${log}" return 1 fi fi - info "$(get_msg 'cmd_installer_pc_mkfs')" + info "$(get_msg 'installer_pc_mkfs')" if ! log="$(${MKE2FS} -t ext4 -- "${dev}1" 2>&1)"; then - error "$(get_msg 'cmd_installer_pc_mkfs_fail')" + error "$(get_msg 'installer_pc_mkfs_fail')" _installer_pc_log_print 'mke2fs' "${log}" return 1 fi |