bringup: refreshing a base OS template failed

virtbuilder complained about a missing argument for "-u" when it
tried to refresh a local copy of a guest template.

Preserve the quiet behavior introduced by commit 47d19e2
("bringup_guestfs.sh: few minor fixes for libvirt URI users"), but
ensure that the "-u" option is always filled in when the control
host already has a "kdevops" user ID.

Fixes: 47d19e2 ("bringup_guestfs.sh: few minor fixes for libvirt URI users")
Signed-off-by: Chuck Lever <[email protected]>

Author: chucklever

scripts/bringup_guestfs.sh

@@ -200,9 +200,9 @@ _EOT
 pre_install_customizations()
 {
 	KDEVOPS_UID=""
-	TEST_UID=`id -u kdevops 2>&1 > /dev/null`
+	id -u kdevops 2>&1 > /dev/null
 	if [ $? -eq 0 ]; then
-		KDEVOPS_UID="-u ${TEST_UID}"
+		KDEVOPS_UID="-u `id -u kdevops`"
 	fi
 	if echo $OS_VERSION | grep -qE "^(rhel|fedora|centos)"; then
 		UPDATE_GRUB_CMD="/usr/sbin/grub2-mkconfig -o /boot/grub2/grub.cfg"