kreyren/parabola-vmbootstrap
1
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Activity

generalize pvm_get_script() fn

Browse Source
This commit is contained in:
bill-auger 2020-03-31 11:54:10 -04:00
parent 0bb5ae3842
commit 29567e455d
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/pvm-common.sh.inc
View File

@ -9,14 +9,15 @@ readonly MOUNTVARS_ERR_MSG="FIXME: pvm_setup_loopdev() was called in an improper
source "$(librelib messages)" source "$(librelib messages)"
pvm_get_pvmboot_cmd() pvm_get_script() # (script_name)
{ {
local intree_cmd=$THIS_DIR/pvmboot.sh local script_name=$1
local installed_cmd='pvmboot' local intree_script=$THIS_DIR/$script_name.sh
local installed_script=$script_name
[[ -f "$intree_cmd" ]] && echo "$intree_cmd" && return "$EXIT_SUCCESS" [[ -f "$intree_script" ]] && echo "$intree_script" && return "$EXIT_SUCCESS"
type -p $installed_cmd &>/dev/null && echo "$installed_cmd" && return "$EXIT_SUCCESS" type -p $installed_script &>/dev/null && echo "$installed_script" && return "$EXIT_SUCCESS"
error "can not find pvmboot" && return "$EXIT_FAILURE" error "can not find $script_name" && return "$EXIT_FAILURE"
} }
pvm_get_hook() # ( hook_name ) pvm_get_hook() # ( hook_name )
@ -253,12 +254,12 @@ pvm_boot() # ( imagefile qemu_args )
{ {
local imagefile="$1" ; shift ; local imagefile="$1" ; shift ;
local qemu_args=(-no-reboot $@) local qemu_args=(-no-reboot $@)
local pvmboot_cmd=$(pvm_get_pvmboot_cmd) local pvmboot_script=$(pvm_get_script 'pvmboot')
local was_error=$? local was_error=$?
[[ "$pvmboot_cmd" ]] || return $EXIT_FAILURE [[ "$pvmboot_script" ]] || return $EXIT_FAILURE
DISPLAY='' "$pvmboot_cmd" "$imagefile" "${qemu_args[@]}" ; was_error=$? ; DISPLAY='' "$pvmboot_script" "$imagefile" "${qemu_args[@]}" ; was_error=$? ;
(( ! $was_error )) && return $EXIT_SUCCESS || return $EXIT_FAILURE (( ! $was_error )) && return $EXIT_SUCCESS || return $EXIT_FAILURE
} }

4
src/pvmbootstrap.sh
View File

@ -394,8 +394,8 @@ pvm_bootstrap_preinit() # assumes: $imagefile
pvm_check_no_mounts || return "$EXIT_FAILURE" pvm_check_no_mounts || return "$EXIT_FAILURE"
# boot the machine to run the pre-init hooks # boot the machine to run the pre-init hooks
[[ "$(pvm_get_pvmboot_cmd)" ]] && msg "booting the VM to run the pre-init hooks" || \ [[ "$(pvm_get_script 'pvmboot')" ]] && msg "booting the VM to run the pre-init hooks" || \
warning "unable to run pre-init hooks" warning "unable to run pre-init hooks"
exec 3>&1 exec 3>&1
pvm_boot "$imagefile" | tee /dev/fd/3 | grep -q -F "$PVM_HOOKS_SUCCESS_MSG" pvm_boot "$imagefile" | tee /dev/fd/3 | grep -q -F "$PVM_HOOKS_SUCCESS_MSG"
local res=$? local res=$?