debug: bundles
This commit is contained in:
parent
b5cd4af457
commit
090353da56
1 changed files with 5 additions and 5 deletions
10
setup.sh
10
setup.sh
|
|
@ -16,7 +16,7 @@ else
|
|||
echo "(${guest_name}) setting up remote 'dom0' to pull changes via bundle" >&2
|
||||
echo "ehhh"
|
||||
echo ${guest_repo_dir}
|
||||
git remote add dom0 ${guest_repo_dir}/.bundles/dom0.bundle
|
||||
git remote add dom0 ${guest_repo_dir}/.bundles/qubes-mgmt-salt
|
||||
fi
|
||||
|
||||
branch=$(git branch --show-current)
|
||||
|
|
@ -33,7 +33,7 @@ set -eo pipefail
|
|||
|
||||
echo "(dom0) bringing bundle from qubes '${guest_name}'" >&2
|
||||
|
||||
qvm-run -p ${guest_name} "cat ${guest_repo_dir}/.bundles/domu.bundle" </dev/null >/tmp/saltstuff.bundle
|
||||
qvm-run -p ${guest_name} "cat ${guest_repo_dir}/.bundles/qubes-mgmt-salt" </dev/null >/tmp/saltstuff.bundle
|
||||
|
||||
echo "{dom0} cloning into \$1; checking out branch '${branch}'" >&2
|
||||
|
||||
|
|
@ -44,16 +44,16 @@ pushd "\$1"
|
|||
echo "{dom0} setting up remote '${guest_name}' to push/pull changes via bundle" >&2
|
||||
|
||||
mkdir ./.bundles
|
||||
mv /tmp/saltstuff.bundle ./.bundles/domu.bundle
|
||||
mv /tmp/saltstuff.bundle ./.bundles/qubes-mgmt-salt
|
||||
git remote remove origin
|
||||
git remote add "${guest_name}" \$(pwd)/.bundles/domu.bundle
|
||||
git remote add "${guest_name}" \$(pwd)/.bundles/qubes-mgmt-salt
|
||||
|
||||
# ensure remote refs are present in each repo
|
||||
git fetch "${guest_name}" # ensure remote refs are present in the dom0 repo
|
||||
|
||||
git bundle create .bundles/dom0.bundle main~1..main main
|
||||
|
||||
qvm-run -p "${guest_name}" "cat > ${guest_repo_dir}/.bundles/dom0.bundle" <.bundles/dom0.bundle
|
||||
qvm-run -p "${guest_name}" "cat > ${guest_repo_dir}/.bundles/qubes-mgmt-salt" <.bundles/qubes-mgmt-salt
|
||||
|
||||
qvm-run -p "${guest_name}" "cd ${guest_repo_dir} && git fetch dom0" </dev/null
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue