Commit 7ca3e85
committed
scripts/libvirt_pool.sh: fix regression with pool heuristics
Heavy users of kdevops will often want to dedicate an entire
partition so that it can be used for all guests of *all users*.
This also allows us to share *all guestfs images* so we only
have to download a guestfs image once for custom images like
Debian Trixie.
For instance:
sudo virsh pool-dumpxml xfs1 | grep path
<path>/xfs1</path>
If we go back in history we can see this used to work, let's try
with the first repo's tree's history, we *used* to get:
mcgrof@big-box /xfs1/mcgrof/debug-pools/kdevops (git::main)$
make mrproper; make defconfig-kernel-hacking > /dev/null 2>&1
grep CONFIG_KDEVOPS_STORAGE_POOL_PATH .config
CONFIG_KDEVOPS_STORAGE_POOL_PATH="/xfs1"
Now we get:
mcgrof@big-box /xfs1/mcgrof/debug-pools/kdevops (git::main)$
make mrproper; make defconfig-kernel-hacking > /dev/null 2>&1
grep CONFIG_KDEVOPS_STORAGE_POOL_PATH .config
CONFIG_KDEVOPS_STORAGE_POOL_PATH="/xfs1/mcgrof/debug-pools/kdevops/default
So now we lie, because the heuristic to see if we can use sudo for virsh
pool stuff is broken, so we try to create a new pool every single time
the user uses kdevops. I bisected this down to commit bc731be
("scripts: Adjust heuristic to see if current user can sudo"), so the
pool heuristic has been broken since January 13th.
That also means we were forcing down each new CI in place the download
of a new debian trixie image.
There's a few issues with this new heuristic:
1) CAN_SUDO=get_can_sudo
Well that's just a string, not an execution so we never even
ran this new routine.
2) It's a good thing we never ran it anyway because the routine
calls exit
3) The sudo heuristic was broken as it assumed the -eq would capture
previous routine's exit call but, $(foo) it actually just captures
the output. So it could never have worked.
Fix the heuristics. Even though a first reaction may be to see if
we can move away from these shell heuristics with ansible, these
helpers are used by scripts we use to set default variables inside
Kconfig strings and bools so ansible can't be used unless we're
comfortable with the idea of calling ansible as part of a local
playbook to do some local work. Maybe that is not crazy idea after all.
Cc: Swarna Prabhu <[email protected]>
Cc: Joel Granados <[email protected]>
Signed-off-by: Luis Chamberlain <[email protected]>1 parent 53d1d15 commit 7ca3e85
1 file changed
+2
-4
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | | - | |
19 | 18 | | |
20 | 19 | | |
21 | | - | |
22 | 20 | | |
23 | 21 | | |
24 | 22 | | |
| |||
30 | 28 | | |
31 | 29 | | |
32 | 30 | | |
33 | | - | |
| 31 | + | |
34 | 32 | | |
35 | 33 | | |
36 | 34 | | |
| |||
0 commit comments