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

housekeeping

Browse Source
This commit is contained in:
bill-auger 2020-03-31 12:13:42 -04:00
parent 29567e455d
commit 03a480a894
No known key found for this signature in database
GPG Key ID: 908710913E8C7778
4 changed files with 48 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,3 +1,25 @@
#!/bin/bash
###############################################################################
# parabola-vmbootstrap -- create and start parabola virtual machines #
# #
# Copyright (C) 2017 - 2019 Andreas Grapentin #
# Copyright (C) 2019 - 2020 bill-auger #
# #
# This program is free software: you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation, either version 3 of the License, or #
# (at your option) any later version. #
# #
# This program is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with this program. If not, see <http://www.gnu.org/licenses/>. #
###############################################################################
# readonly DATA_IMG=./pvmdata.img # optional large qemu disk # readonly DATA_IMG=./pvmdata.img # optional large qemu disk
readonly THIS_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")" readonly THIS_DIR="$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"
readonly UNPRIVILEGED_ERR_MSG="This program must be run as a regular user" readonly UNPRIVILEGED_ERR_MSG="This program must be run as a regular user"
@ -197,7 +219,8 @@ pvm_cleanup() # unsets: $loopdev , untraps: INT TERM EXIT
trap - INT TERM EXIT trap - INT TERM EXIT
pvm_umount pvm_umount
sudo losetup -d "$loopdev"
sudo losetup -d "$loopdev" &> /dev/null
pvm_check_no_mounts || return "$EXIT_FAILURE" pvm_check_no_mounts || return "$EXIT_FAILURE"
unset loopdev unset loopdev

4
src/pvm2tarball.sh
View File

@ -100,8 +100,8 @@ EOF
} }
if source /usr/lib/parabola-vmbootstrap/pvm-common.sh.inc 2> /dev/null || \ if source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/pvm-common.sh.inc 2> /dev/null || \
source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/pvm-common.sh.inc 2> /dev/null source /usr/lib/parabola-vmbootstrap/pvm-common.sh.inc 2> /dev/null
then main "$@" then main "$@"
else echo "can not find pvm-common.sh.inc" && exit 1 else echo "can not find pvm-common.sh.inc" && exit 1
fi fi

4
src/pvmboot.sh
View File

@ -175,8 +175,8 @@ main() # ( [cli_options] imagefile qemu_args )
} }
if source /usr/lib/parabola-vmbootstrap/pvm-common.sh.inc 2> /dev/null || \ if source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/pvm-common.sh.inc 2> /dev/null || \
source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/pvm-common.sh.inc 2> /dev/null source /usr/lib/parabola-vmbootstrap/pvm-common.sh.inc 2> /dev/null
then main "$@" then main "$@"
else echo "can not find pvm-common.sh.inc" && exit 1 else echo "can not find pvm-common.sh.inc" && exit 1
fi fi

30
src/pvmbootstrap.sh
View File

@ -75,16 +75,17 @@ usage()
echo echo
echo "Supported options:" echo "Supported options:"
echo " -b <base-set> Select one of the pre-defined package-sets described below" echo " -b <base-set> Select one of the pre-defined package-sets described below"
echo " (default: 'standard')" echo " (default: '$PKG_SET_STD')"
echo " -h Display this help and exit" echo " -h Display this help and exit"
echo " -H <hook> Enable a hook to customize the created image. This can be" echo " -H <hook> Enable a hook to customize the created image. This can be"
echo " the path to a script, which will be executed once within" echo " the path to a script, which will be executed once within"
echo " the running VM, or one of the pre-defined hooks described" echo " the running VM, or one of the pre-defined hooks described"
echo " below. This option can be specified multiple times." echo " below. This option can be specified multiple times."
echo " -k <kernel> Specify an additional kernel package (default: $DEF_KERNEL)." echo " -k <kernel> Specify a kernel package (default: ''). "
echo " This option can be specified multiple times; but note that" echo " This option can be specified multiple times; but note that"
echo " '$DEF_KERNEL' will be installed as part of the '$PKG_SET_STD' and" echo " '$DEF_KERNEL' will be installed as part of the '$PKG_SET_STD' and"
echo " '$PKG_SET_DEV' package sets, regardless of this option." echo " '$PKG_SET_DEV' package sets, regardless of this option,"
echo " and no kernel is installed as part of the '$PKG_SET_MIN' package set."
echo " -M <mirror> Specify a different mirror from which to fetch packages" echo " -M <mirror> Specify a different mirror from which to fetch packages"
echo " (default: $DEF_MIRROR)" echo " (default: $DEF_MIRROR)"
echo " -O Bootstrap an openrc system instead of a systemd one" echo " -O Bootstrap an openrc system instead of a systemd one"
@ -120,15 +121,15 @@ pvm_bootstrap() # assumes: $arch $imagefile $loopdev $workdir , traps: INT TERM
mkdir -p "$(dirname "$imagefile")" || return "$EXIT_FAILURE" mkdir -p "$(dirname "$imagefile")" || return "$EXIT_FAILURE"
pvm_prompt_clobber_file "$imagefile" || return "$EXIT_FAILURE" pvm_prompt_clobber_file "$imagefile" || return "$EXIT_FAILURE"
msg "starting build for %s image: %s" "$arch" "$imagefile"
# create the raw image file
local img_mb=$(( $BootSizeMb + $SwapSizeMb + $RootSizeMb ))
qemu-img create -f raw "$imagefile" "${img_mb}M" || return "$EXIT_FAILURE"
# prepare for cleanup # prepare for cleanup
trap 'pvm_bootstrap_cleanup' INT TERM RETURN trap 'pvm_bootstrap_cleanup' INT TERM RETURN
local img_mb=$(( $BootSizeMb + $SwapSizeMb + $RootSizeMb ))
msg "starting build for %s image: %s (%sMB)" "$arch" "$imagefile" "$img_mb"
# create the raw image file
qemu-img create -f raw "$imagefile" "${img_mb}M" || return "$EXIT_FAILURE"
# mount the virtual disk # mount the virtual disk
local bootdir workdir loopdev local bootdir workdir loopdev
pvm_setup_loopdev || return "$EXIT_FAILURE" # sets: $bootdir $workdir $loopdev pvm_setup_loopdev || return "$EXIT_FAILURE" # sets: $bootdir $workdir $loopdev
@ -468,7 +469,12 @@ main() # ( [cli_options] imagefile arch )
# create the virtual machine # create the virtual machine
if pvm_bootstrap; then if pvm_bootstrap; then
if pvm_bootstrap_preinit; then if ! (( ${#Kernels[@]} )) ; then
msg "bootstrap complete for image: %s" "$imagefile"
warning "the preinit procedure was not run because no kernel was installed and no initcpio exists"
warning "the preinit procedure will run when the image is booted for the first time"
exit "$EXIT_SUCCESS"
elif pvm_bootstrap_preinit; then
msg "bootstrap complete for image: %s" "$imagefile" msg "bootstrap complete for image: %s" "$imagefile"
exit "$EXIT_SUCCESS" exit "$EXIT_SUCCESS"
else else
@ -482,8 +488,8 @@ main() # ( [cli_options] imagefile arch )
} }
if source /usr/lib/parabola-vmbootstrap/pvm-common.sh.inc 2> /dev/null || \ if source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/pvm-common.sh.inc 2> /dev/null || \
source "$(dirname "$(readlink -f "${BASH_SOURCE[0]}")")"/pvm-common.sh.inc 2> /dev/null source /usr/lib/parabola-vmbootstrap/pvm-common.sh.inc 2> /dev/null
then main "$@" then main "$@"
else echo "can not find pvm-common.sh.inc" && exit 1 else echo "can not find pvm-common.sh.inc" && exit 1
fi fi