lbailly/liminix
1
0
Fork 0
forked from DGNum/liminix
Code Pull requests 2 Activity Actions

min-copy-closure: add --root to copy to non-standard place

Browse source
This commit is contained in:
Daniel Barlow 2023-12-23 23:12:40 +00:00
parent dbf1ecdcb7
commit 29f35cb902
2 changed files with 50 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
pkgs/min-copy-closure/min-copy-closure.sh
View file

@ -1,20 +1,49 @@
#!/usr/bin/env bash #!/usr/bin/env bash
ssh_command=${SSH_COMMAND-ssh} ssh_command=${SSH_COMMAND-ssh}
target_host=$1
shift root_prefix=/
verbose=true
while [[ $# -gt 0 ]]; do
case $1 in
-r|--root)
root_prefix="$2"
shift
shift
;;
-q|--quiet)
verbose=""
shift
;;
-*|--*)
echo "Unknown option $1"
exit 1
;;
*)
if test -z "$target_host"; then
target_host="$1"
else
paths+=("$1") # save positional arg
fi
shift # past argument
;;
esac
done
progress() {
test -n "$verbose" && echo $*
}
if [ -z "$target_host" ] ; then if [ -z "$target_host" ] ; then
echo Usage: min-copy-closure target-host paths echo Usage: min-copy-closure [--root /mnt] target-host paths
exit 1 exit 1
fi fi
if [ -n "$IN_NIX_BUILD" ] ; then if [ -z "$IN_NIX_BUILD" ] ; then
# can't run nix-store in a derivation, so we have to # can't run nix-store in a derivation, so we have to
# skip the requisites when running tests in hydra # skip the requisites when running tests in hydra
paths=$@ paths=$(nix-store -q --requisites "$paths")
else
paths=$(nix-store -q --requisites "$@")
fi fi
needed="" needed=""
@ -25,16 +54,16 @@ coproc remote {
exec 10>&${remote[1]} exec 10>&${remote[1]}
for p in $paths; do for p in $paths; do
echo -n Checking $(basename $p) ... progress -n Checking $(basename $p) ...
echo "test -e $p && echo skip || echo $p" >&10 echo "test -e ${root_prefix}$p && echo skip || echo $p" >&10
read n <&${remote[0]} read n <&${remote[0]}
case $n in case $n in
skip) skip)
echo skip progress skip
;; ;;
*) *)
needed="${needed} $n" needed="${needed} $n"
echo will copy progress will copy
;; ;;
esac esac
done done
@ -44,10 +73,11 @@ if test -z "$needed" ; then
exit 1 exit 1
fi fi
echo "cd / && cpio -i >/dev/console" >&10 echo "cd ${root_prefix} && cpio -d -i >/dev/console" >&10
find $needed | cpio -H newc -o >&10 find $needed | cpio -H newc -o >&10
echo "date" >&10 # make sure the connection hasn't died
echo "echo finished" >&10
read n <&${remote[0]} read n <&${remote[0]}
echo $n echo $n

8
tests/min-copy-closure/test.nix
View file

@ -19,11 +19,15 @@ in pkgs.runCommand "check" {
} '' } ''
. ${../test-helpers.sh} . ${../test-helpers.sh}
(
mkdir vm mkdir vm
${img}/run.sh --lan user,hostfwd=tcp::2022-:22 --background ./vm ${img}/run.sh --lan user,hostfwd=tcp::2022-:22 --background ./vm
expect ${./wait-until-ready.expect} expect ${./wait-until-ready.expect}
export SSH_COMMAND="ssh -o StrictHostKeyChecking=no -p 2022 -i ${./id}" export SSH_COMMAND="ssh -o StrictHostKeyChecking=no -p 2022 -i ${./id}"
$SSH_COMMAND root@localhost echo ready $SSH_COMMAND root@localhost echo ready
IN_NIX_BUILD=true min-copy-closure root@localhost ${rogue} IN_NIX_BUILD=true min-copy-closure --quiet root@localhost ${rogue}
$SSH_COMMAND root@localhost ls -l ${rogue} >$out $SSH_COMMAND root@localhost ls -ld ${rogue}
IN_NIX_BUILD=true min-copy-closure --root /run root@localhost ${rogue}
$SSH_COMMAND root@localhost ls -ld /run/${rogue}
) 2>&1 | tee $out
'' ''