[PATCH 09/10] guestfs: move pre-install customizations to its own routine

[Luis Chamberlain <mcgrof@kernel.org>]

As with prior commits, move pre-install customizations to its
own routine.

Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
 scripts/bringup_guestfs.sh | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh
index 8210b3cf1b19..6f96b5c2029a 100755
--- a/scripts/bringup_guestfs.sh
+++ b/scripts/bringup_guestfs.sh
@@ -189,6 +189,18 @@ copy-in $CONFIG_GUESTFS_DISTRO_SOURCE_AND_DEST_FILE:$TARGET_DIR
 _EOT
 }
 
+pre_install_customizations()
+{
+	cat <<_EOT >>$cmdfile
+install sudo,qemu-guest-agent,python3,bash
+run-command useradd -m kdevops -s /bin/bash
+append-line /etc/sudoers.d/kdevops:kdevops   ALL=(ALL)       NOPASSWD: ALL
+edit /etc/default/grub:s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"/
+run-command /usr/sbin/update-grub2
+root-password password:kdevops
+_EOT
+}
+
 mkdir -p $STORAGEDIR
 mkdir -p $BASE_IMAGE_DIR
 
@@ -218,15 +230,7 @@ if [ ! -f $BASE_IMAGE ]; then
 		copy_host_sources
 	fi
 
-# basic pre-install customization
-	cat <<_EOT >>$cmdfile
-install sudo,qemu-guest-agent,python3,bash
-run-command useradd -m kdevops -s /bin/bash
-append-line /etc/sudoers.d/kdevops:kdevops   ALL=(ALL)       NOPASSWD: ALL
-edit /etc/default/grub:s/^GRUB_CMDLINE_LINUX_DEFAULT=.*/GRUB_CMDLINE_LINUX_DEFAULT="console=ttyS0"/
-run-command /usr/sbin/update-grub2
-root-password password:kdevops
-_EOT
+	pre_install_customizations
 
 	if [ $DO_UNREG -ne 0 ]; then
 		handle_rhel_unreg
-- 
2.43.0