index : mkinitcpio-archiso32 | |
Archlinux32 initcpio scripts used by archiso | gitolite user |
summaryrefslogtreecommitdiff |
author | David Runge <dvzrv@archlinux.org> | 2020-07-11 18:13:20 +0200 |
---|---|---|
committer | David Runge <dvzrv@archlinux.org> | 2020-07-11 20:58:01 +0200 |
commit | 043262b5f71e3030ad5553597b0e9696f6ff56b2 (patch) | |
tree | c77adfaca93127661d7fc2f5c0b1e95c7cfd6af4 /hooks/archiso_pxe_nfs | |
parent | ab2b8f8286383599b76f9f2db450ac417bd3fc1c (diff) |
-rw-r--r-- | hooks/archiso_pxe_nfs | 28 |
diff --git a/hooks/archiso_pxe_nfs b/hooks/archiso_pxe_nfs index 67874ec..406541b 100644 --- a/hooks/archiso_pxe_nfs +++ b/hooks/archiso_pxe_nfs @@ -1,30 +1,40 @@ -# vim: set ft=sh: +#!/bin/ash run_hook() { - if [[ -n "${ip}" && -n "${archiso_nfs_srv}" ]]; then + # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + if [ -n "${ip}" ] && [ -n "${archiso_nfs_srv}" ]; then - archiso_nfs_srv=$(eval echo ${archiso_nfs_srv}) - [[ -n "${archiso_nfs_opt}" ]] && archiso_nfs_opt="-o ${archiso_nfs_opt}" + archiso_nfs_srv=$(eval echo "${archiso_nfs_srv}") - mount_handler="archiso_nfs_mount_handler" + export mount_handler="archiso_nfs_mount_handler" fi } archiso_nfs_mount_handler() { + local mount_status newroot="${1}" mkdir -p "/run/archiso/bootmnt" msg ":: Mounting '${archiso_nfs_srv}'" - # Do not put "${archiso_nfs_opt}" nfsmount fails! - if ! nfsmount ${archiso_nfs_opt} "${archiso_nfs_srv}" "/run/archiso/bootmnt"; then + # shellcheck disable=SC2154 # defined via initcpio's parse_cmdline() + if [ -n "${archiso_nfs_opt}" ]; then + nfsmount -o "${archiso_nfs_opt}" "${archiso_nfs_srv}" "/run/archiso/bootmnt" + mount_status=$? + else + nfsmount "${archiso_nfs_srv}" "/run/archiso/bootmnt" + mount_status=$? + fi + if [ $mount_status -gt 0 ]; then echo "ERROR: Mounting '${archiso_nfs_srv}'" echo " Falling back to interactive prompt" echo " You can try to fix the problem manually, log out when you are finished" launch_interactive_shell fi - if [[ "${copytoram}" != "n" ]]; then + if [ "${copytoram}" != "n" ]; then copytoram="y" fi - archiso_mount_handler ${newroot} + archiso_mount_handler "${newroot}" } + +# vim: set ft=sh: |