colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tools: nm-in-vm: fix CentOS Stream guest

Browse Source 
Install missing repositories required to install all the packages.

Unluckily, it doesn't support 9P filesystem shares, and virtiofs is not
supported for non-root hosts. Emit a warning about that.
This commit is contained in:
Íñigo Huguet
2023-08-07 15:19:14 +02:00
parent f9cfe80b56
commit 25e6218e94
1 changed files with 23 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tools/nm-in-vm
View File

@@ -158,7 +158,7 @@ do_build() {
) )
fi fi
if [[ $OS_VERSION =~ fedora* || $OS_VERSION =~ centos* ]]; then if [[ $OS_VERSION =~ fedora* || $OS_VERSION =~ centosstream* ]]; then
extra_pkgs=(bash-completion bind-utils ccache clang-tools-extra cryptsetup cscope \'dbus\*\' extra_pkgs=(bash-completion bind-utils ccache clang-tools-extra cryptsetup cscope \'dbus\*\'
dhcp-client dhcp-relay dhcp-server dnsmasq dracut-network ethtool firewalld gcc gdb dhcp-client dhcp-relay dhcp-server dnsmasq dracut-network ethtool firewalld gcc gdb
glibc-langpack-pl hostapd intltool iproute ipsec-tools iputils iscsi-initiator-utils glibc-langpack-pl hostapd intltool iproute ipsec-tools iputils iscsi-initiator-utils
@@ -172,7 +172,21 @@ do_build() {
/usr/bin/debuginfo-install /usr/bin/pytest /usr/bin/python vim wireguard-tools /usr/bin/debuginfo-install /usr/bin/pytest /usr/bin/python vim wireguard-tools
wireshark-cli) wireshark-cli)
install_pkgs=( if [[ $OS_VERSION == centosstream-8 ]]; then
install_pkgs=(
--run-command "dnf -y copr enable nmstate/nm-build-deps"
--run-command "dnf config-manager -y --set-enabled powertools"
--install epel-release,epel-next-release
)
elif [[ $OS_VERSION == centosstream-9 ]]; then
install_pkgs=(
--run-command "dnf -y copr enable nmstate/nm-build-deps"
--run-command "dnf config-manager -y --set-enabled crb"
--install epel-release,epel-next-release
)
fi
install_pkgs+=(
--update --update
--run "$BASEDIR_NM/contrib/fedora/REQUIRED_PACKAGES" --run "$BASEDIR_NM/contrib/fedora/REQUIRED_PACKAGES"
--run-command "dnf install -y --skip-broken ${extra_pkgs[*]}" --run-command "dnf install -y --skip-broken ${extra_pkgs[*]}"
@@ -237,6 +251,12 @@ do_build() {
echo " - NM CI DIR: $([[ -n $BASEDIR_NM_CI ]] && echo "$BASEDIR_NM_CI" || echo '<none>')" echo " - NM CI DIR: $([[ -n $BASEDIR_NM_CI ]] && echo "$BASEDIR_NM_CI" || echo '<none>')"
echo " - HOST BRIDGE: $HOST_BRIDGE" echo " - HOST BRIDGE: $HOST_BRIDGE"
if [[ $OS_VERSION =~ centosstream-* ]]; then
echo "WARNING: NetworkManager repositories can't be shared with the guest" \
"(CentOS Stream doesn't support 9P filesystem). You'll need to manually" \
"share by NFS or make a new clone of the repository inside the guest." >&2
fi
virt-builder "$OS_VERSION" \ virt-builder "$OS_VERSION" \
--output "$basedir_vm_image/$vm_image_file" \ --output "$basedir_vm_image/$vm_image_file" \
"${size[@]}" \ "${size[@]}" \
@@ -253,6 +273,7 @@ do_build() {
"${nm_ci_build_args[@]}" \ "${nm_ci_build_args[@]}" \
"${install_pkgs[@]}" \ "${install_pkgs[@]}" \
--mkdir "/etc/systemd/system/NetworkManager.service.d" \ --mkdir "/etc/systemd/system/NetworkManager.service.d" \
--mkdir "/etc/systemd/network" \
"${install_files[@]}" \ "${install_files[@]}" \
--write "/var/lib/NetworkManager/secret_key:nm-in-container-secret-key" \ --write "/var/lib/NetworkManager/secret_key:nm-in-container-secret-key" \
--chmod "700:/var/lib/NetworkManager" \ --chmod "700:/var/lib/NetworkManager" \