diff options
| author | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 08:40:30 (EST) |
|---|---|---|
| committer | Patrick McDermott <patrick.mcdermott@libiquity.com> | 2021-01-16 08:49:34 (EST) |
| commit | f819b8160603a6e23a6b9ae91fa6080e6b65e63b (patch) | |
| tree | ff556b8ce327ceadd9fc693e53870a1d95e1ef54 | |
| parent | 397e2b52f0f04d9dca5d0629dd11744560718f9c (diff) | |
installer/pc: Make functions "public"
| -rw-r--r-- | src/installer/pc.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/installer/pc.sh b/src/installer/pc.sh index ce1b898..43006f5 100644 --- a/src/installer/pc.sh +++ b/src/installer/pc.sh @@ -18,7 +18,7 @@ # along with the ProteanOS Development Kit. If not, see # <http://www.gnu.org/licenses/>. -_installer_pc_log_print() +installer_pc_log_print() { local prefix="${1}" local log="${2}" @@ -32,7 +32,7 @@ _installer_pc_log_print() unset IFS } -_installer_pc_make_partition_and_fs() +installer_pc_make_partition_and_fs() { local dev="${1}" shift 1 @@ -41,7 +41,7 @@ _installer_pc_make_partition_and_fs() info "$(get_msg 'installer_pc_dd')" if ! log="$(dd if=/dev/zero of="${dev}" bs=512 count=1 2>&1)"; then error "$(get_msg 'installer_pc_dd_fail')" - _installer_pc_log_print 'dd' "${log}" + installer_pc_log_print 'dd' "${log}" return 1 fi @@ -50,14 +50,14 @@ _installer_pc_make_partition_and_fs() if ! log="$(printf ',,83,*\n' | ${SFDISK} -- "${dev}" 2>&1)" then error "$(get_msg 'installer_pc_fdisk_fail')" - _installer_pc_log_print 'sfdisk' "${log}" + 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 'installer_pc_fdisk_fail')" - _installer_pc_log_print 'fdisk' "${log}" + installer_pc_log_print 'fdisk' "${log}" return 1 fi fi @@ -65,7 +65,7 @@ _installer_pc_make_partition_and_fs() info "$(get_msg 'installer_pc_mkfs')" if ! log="$(${MKE2FS} -t ext4 -- "${dev}1" 2>&1)"; then error "$(get_msg 'installer_pc_mkfs_fail')" - _installer_pc_log_print 'mke2fs' "${log}" + installer_pc_log_print 'mke2fs' "${log}" return 1 fi @@ -84,7 +84,7 @@ installer_pc_main() return 1 fi - if ! _installer_pc_make_partition_and_fs "${dev}"; then + if ! installer_pc_make_partition_and_fs "${dev}"; then return 1 fi if ! root="$(block_mount "${dev}1")"; then |