From 177e50498ce8a8e3beb45c0dcf4c576a91ef8158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Wed, 4 Dec 2019 17:14:30 +0100 Subject: [PATCH 1/8] Initial Fedora OpenNebula image definition --- fedora-build-opennebula-image.sh | 145 +++++++++++++++++++++++++++++++ 1 file changed, 145 insertions(+) create mode 100755 fedora-build-opennebula-image.sh diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh new file mode 100755 index 0000000..419e193 --- /dev/null +++ b/fedora-build-opennebula-image.sh @@ -0,0 +1,145 @@ +#!/bin/sh + +# This script generates Fedora images for OpenNebula, being heavily inspired +# from srht's Fedora build image definition. + +# We could have used the Fedora Server Edition or even the @Core package group +# (detailed below) but the result image would be quite large/bloated with +# unecessary dependencies. This scheme allows maximum flexibility, and is +# definitely opinionated. + +# Depends on the following packages (as of Fedora 31): +# qemu-img util-linux coreutils dnf curl + +# Run locally (without network) with: +# qemu-system-x86_64 -enable-kvm -m 1G -drive file=$IMAGE,format=qcow2 + +set -e +set -x + +# XXX: Handle command-line arguments? +RELEASE=31 +ARCH=x86_64 +IMAGE_PATH=fedora-$RELEASE-$(date --iso-8601).img.qcow2 +IMAGE_SIZE=10G +NBD_DEVICE=/dev/nbd1 + +# TODO: find the package definition and built ourself, publish in some RPM repository. +ONE_CONTEXT_RPM_URL="https://github.com/OpenNebula/addon-context-linux/releases/download/v5.10.0/one-context-5.10.0-1.el8.noarch.rpm" +ONE_CONTEXT_RPM_PATH=/root/one-context.rpm + +cleanup() { + # The order here is important. + umount /mnt/dev/pts 2>/dev/null || true + umount /mnt/dev/shm 2>/dev/null || true + umount /mnt/dev 2>/dev/null || true + umount /mnt/proc 2>/dev/null || true + umount /mnt/run 2>/dev/null || true + umount /mnt/sys 2>/dev/null || true + umount /mnt/boot 2>/dev/null || true + umount /mnt 2>/dev/null || true + qemu-nbd --disconnect "$NBD_DEVICE" || true +} + +run_root() { + chroot /mnt /usr/bin/env \ + PATH=/sbin:/usr/sbin:/bin:/usr/bin \ + sh -c "$*" +} + +if [ "$(whoami)" != 'root' ]; then + echo "This script must be run as root." >&2 + exit 1 +fi + +if [ ! -f '/etc/fedora-release' ]; then + echo "WARNING: this script has been designed to run on a Fedora system." >&2 + echo "WARNING: Not running Fedora. Giving you 5 seconds to abort." >&2 + sleep 5 +fi + +# Create base QCOW2 image. +qemu-img create -f qcow2 "$IMAGE_PATH" "$IMAGE_SIZE" +modprobe nbd max_part=16 +qemu-nbd --connect="$NBD_DEVICE" "$IMAGE_PATH" + +# Don't forget to cleanup, even if the script crash. +trap cleanup EXIT + +# Create partition table, format partitions. +sfdisk --no-reread "$NBD_DEVICE" <> /mnt/etc/resolv.conf + +# See https://github.com/OpenNebula/addon-context-linux/issues/121 for details. +# network-scripts.x86_64 : Legacy scripts for manipulating of network devices +run_root dnf -y install network-scripts + +# Install (magic?) one-context RPM and hope things works as expected. +curl -L "$ONE_CONTEXT_RPM_URL" > "/mnt$ONE_CONTEXT_RPM_PATH" +run_root dnf -y install "$ONE_CONTEXT_RPM_PATH" +run_root rm "$ONE_CONTEXT_RPM_PATH" + +# Initalize base services. +run_root systemd-machine-id-setup +run_root systemctl enable systemd-networkd.service + +run_root ln -sf /usr/share/zoneinfo/UTC /etc/localtime +run_root systemctl enable systemd-timesyncd.service + +# Install kernel and bootloader. +run_root dnf -y install kernel grub2 +run_root grub2-install --target=i386-pc "${NBD_DEVICE}" +run_root grub2-mkconfig -o /boot/grub2/grub.cfg + +# Install en configure SSH daemon. +run_root dnf -y install openssh-server +run_root systemctl enable sshd + +# Generate fstab file. +# TODO: use UIDs instead of /dev/vdaX, current scheme is very fragile. +cat >>/mnt/etc/fstab < Date: Thu, 5 Dec 2019 11:40:55 +0100 Subject: [PATCH 2/8] Fedora image: use UUIDs in /etc/fstab --- fedora-build-opennebula-image.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh index 419e193..84d8d57 100755 --- a/fedora-build-opennebula-image.sh +++ b/fedora-build-opennebula-image.sh @@ -135,10 +135,11 @@ run_root dnf -y install openssh-server run_root systemctl enable sshd # Generate fstab file. -# TODO: use UIDs instead of /dev/vdaX, current scheme is very fragile. +boot_uuid=$(blkid --match-tag UUID --output value "${NBD_DEVICE}p1") +root_uuid=$(blkid --match-tag UUID --output value "${NBD_DEVICE}p2") cat >>/mnt/etc/fstab < Date: Thu, 5 Dec 2019 11:43:36 +0100 Subject: [PATCH 3/8] Fedora image: do not install weak dependencies with base system --- fedora-build-opennebula-image.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh index 84d8d57..77d6a0b 100755 --- a/fedora-build-opennebula-image.sh +++ b/fedora-build-opennebula-image.sh @@ -91,6 +91,7 @@ dnf -y \ --disablerepo='*' \ --enablerepo=fedora \ --enablerepo=updates install \ + --setopt=install_weak_deps=False \ basesystem systemd systemd-udev passwd dnf fedora-release mount --bind /dev /mnt/dev From a666916a72609551f1c6e39dd4546d5a928741f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Mon, 9 Dec 2019 08:48:31 +0100 Subject: [PATCH 4/8] Fedora image: initialize /etc/hosts --- fedora-build-opennebula-image.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh index 77d6a0b..40f5d12 100755 --- a/fedora-build-opennebula-image.sh +++ b/fedora-build-opennebula-image.sh @@ -110,6 +110,13 @@ mount --bind /sys /mnt/sys # TODO: use non-$BIGCORP DNS service. echo 'nameserver 1.1.1.1' >> /mnt/etc/resolv.conf +# Initialize /etc/hosts. +cat > /mnt/etc/hosts << EOF +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +EOF + # See https://github.com/OpenNebula/addon-context-linux/issues/121 for details. # network-scripts.x86_64 : Legacy scripts for manipulating of network devices run_root dnf -y install network-scripts From 157379235c42f7bce8672a8122bd023ce99511c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Mon, 9 Dec 2019 09:53:14 +0100 Subject: [PATCH 5/8] Fedora image: reset systemd machine-id and random-seed, clean dnf database --- fedora-build-opennebula-image.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh index 40f5d12..6222efc 100755 --- a/fedora-build-opennebula-image.sh +++ b/fedora-build-opennebula-image.sh @@ -134,6 +134,8 @@ run_root ln -sf /usr/share/zoneinfo/UTC /etc/localtime run_root systemctl enable systemd-timesyncd.service # Install kernel and bootloader. +# Note: linux-firmware is not required our environment and takes almost 200M +# uncompressed but is a direct dependency of kernel-core... run_root dnf -y install kernel grub2 run_root grub2-install --target=i386-pc "${NBD_DEVICE}" run_root grub2-mkconfig -o /boot/grub2/grub.cfg @@ -150,5 +152,14 @@ UUID=$boot_uuid /boot ext4 rw,relatime,data=ordered 0 2 UUID=$root_uuid / ext4 rw,relatime,data=ordered 0 1 EOF +# Reset systemd's environment. +run_root rm -f /etc/machine-id +run_root touch /etc/machine-id +rm -f /var/lib/systemd/random-seed + +# Remove temporary files and reclaim freed disk space. +# Note: build logs could be removed as well. +run_root dnf clean all + # Make sure everything is written to disk before exiting. sync From 7e01fa5f06ba53c7d19d25a3ab83ab18ab598328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Mon, 9 Dec 2019 12:08:11 +0100 Subject: [PATCH 6/8] Fedora image: add virtio-blk driver to initramfs --- fedora-build-opennebula-image.sh | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh index 6222efc..ac26d7d 100755 --- a/fedora-build-opennebula-image.sh +++ b/fedora-build-opennebula-image.sh @@ -137,6 +137,14 @@ run_root systemctl enable systemd-timesyncd.service # Note: linux-firmware is not required our environment and takes almost 200M # uncompressed but is a direct dependency of kernel-core... run_root dnf -y install kernel grub2 + +# Add support for virtio block devices at boot time. +cat > /mnt/etc/dracut.conf.d/virtio-blk.conf < Date: Mon, 9 Dec 2019 14:57:42 +0100 Subject: [PATCH 7/8] Fedora image: mention build-time depency on e2fsprogs --- fedora-build-opennebula-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh index ac26d7d..b120dc6 100755 --- a/fedora-build-opennebula-image.sh +++ b/fedora-build-opennebula-image.sh @@ -9,7 +9,7 @@ # definitely opinionated. # Depends on the following packages (as of Fedora 31): -# qemu-img util-linux coreutils dnf curl +# qemu-img util-linux coreutils dnf curl e2fsprogs # Run locally (without network) with: # qemu-system-x86_64 -enable-kvm -m 1G -drive file=$IMAGE,format=qcow2 From aa01350594f48a88dc82236f60f87a8dca8eefb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Mon, 9 Dec 2019 18:58:41 +0100 Subject: [PATCH 8/8] Fedora image: use `date +%+F` instead of `date --iso-8601` --- fedora-build-opennebula-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fedora-build-opennebula-image.sh b/fedora-build-opennebula-image.sh index b120dc6..4d22522 100755 --- a/fedora-build-opennebula-image.sh +++ b/fedora-build-opennebula-image.sh @@ -20,7 +20,7 @@ set -x # XXX: Handle command-line arguments? RELEASE=31 ARCH=x86_64 -IMAGE_PATH=fedora-$RELEASE-$(date --iso-8601).img.qcow2 +IMAGE_PATH=fedora-$RELEASE-$(date +%+F).img.qcow2 IMAGE_SIZE=10G NBD_DEVICE=/dev/nbd1