From: Luis Chamberlain <mcgrof@kernel.org>
To: kdevops@lists.linux.dev
Cc: mcgrof@kernel.org
Subject: [PATCH 10/10] guestfs: move debian pre-install hacks to its own routine
Date: Tue, 7 May 2024 23:50:38 -0700 [thread overview]
Message-ID: <20240508065039.3408637-11-mcgrof@kernel.org> (raw)
In-Reply-To: <20240508065039.3408637-1-mcgrof@kernel.org>
As with prior commits. Tidy up.
Signed-off-by: Luis Chamberlain <mcgrof@kernel.org>
---
scripts/bringup_guestfs.sh | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/scripts/bringup_guestfs.sh b/scripts/bringup_guestfs.sh
index 6f96b5c2029a..b81c9d5c38d1 100755
--- a/scripts/bringup_guestfs.sh
+++ b/scripts/bringup_guestfs.sh
@@ -201,6 +201,19 @@ root-password password:kdevops
_EOT
}
+# Ugh, debian has to be told to bring up the network and regenerate ssh keys
+# Hope we get that interface name right!
+debian_pre_install_hacks()
+{
+ cat <<_EOT >>$cmdfile
+mkdir /etc/network/interfaces.d/
+append-line /etc/network/interfaces.d/enp1s0:auto enp1s0
+append-line /etc/network/interfaces.d/enp1s0:allow-hotplug enp1s0
+append-line /etc/network/interfaces.d/enp1s0:iface enp1s0 inet dhcp
+firstboot-command dpkg-reconfigure openssh-server
+_EOT
+}
+
mkdir -p $STORAGEDIR
mkdir -p $BASE_IMAGE_DIR
@@ -236,16 +249,8 @@ if [ ! -f $BASE_IMAGE ]; then
handle_rhel_unreg
fi
-# Ugh, debian has to be told to bring up the network and regenerate ssh keys
-# Hope we get that interface name right!
if echo $OS_VERSION | grep -q '^debian'; then
- cat <<_EOT >>$cmdfile
-mkdir /etc/network/interfaces.d/
-append-line /etc/network/interfaces.d/enp1s0:auto enp1s0
-append-line /etc/network/interfaces.d/enp1s0:allow-hotplug enp1s0
-append-line /etc/network/interfaces.d/enp1s0:iface enp1s0 inet dhcp
-firstboot-command dpkg-reconfigure openssh-server
-_EOT
+ debian_pre_install_hacks
fi
echo "Generating new base image for ${OS_VERSION}"
--
2.43.0
prev parent reply other threads:[~2024-05-08 6:50 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-08 6:50 [PATCH 00/10] guestfs: custom image + mirroring sources.list heuristic Luis Chamberlain
2024-05-08 6:50 ` [PATCH 01/10] guestfs: move debian options before image names Luis Chamberlain
2024-05-08 6:50 ` [PATCH 02/10] guestfs: modify grub prompt before first bring up Luis Chamberlain
2024-05-08 6:50 ` [PATCH 03/10] guestfs: set default root password Luis Chamberlain
2024-05-08 6:50 ` [PATCH 04/10] guestfs: check for virt-builder failure Luis Chamberlain
2024-05-08 6:50 ` [PATCH 05/10] guestfs: add initial debian trixie support with custom URLs Luis Chamberlain
2024-05-08 17:30 ` Scott Mayhew
2024-05-11 23:46 ` Luis Chamberlain
2024-05-13 18:28 ` Richard W.M. Jones
2024-05-13 20:50 ` Luis Chamberlain
2024-05-13 20:55 ` Scott Mayhew
2024-05-14 12:04 ` Luis Chamberlain
2024-05-08 6:50 ` [PATCH 06/10] guestfs: add support to infer host distro mirrororing optimizations Luis Chamberlain
2024-05-08 6:50 ` [PATCH 07/10] guestfs: move rhel activation to its own helper Luis Chamberlain
2024-05-08 6:50 ` [PATCH 08/10] guestfs: move copying yum repo to its own routine Luis Chamberlain
2024-05-08 6:50 ` [PATCH 09/10] guestfs: move pre-install customizations " Luis Chamberlain
2024-05-08 6:50 ` Luis Chamberlain [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240508065039.3408637-11-mcgrof@kernel.org \
--to=mcgrof@kernel.org \
--cc=kdevops@lists.linux.dev \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).