From efb7a5f9fab9fca96fc2342b07f98ce982903bed Mon Sep 17 00:00:00 2001 From: Nico Schottelius Date: Wed, 28 Jul 2021 16:32:43 +0200 Subject: [PATCH 1/4] Update alpine version, fix partition bug --- alpine-install-on-disk.sh | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/alpine-install-on-disk.sh b/alpine-install-on-disk.sh index 3a48c40..b4d520a 100755 --- a/alpine-install-on-disk.sh +++ b/alpine-install-on-disk.sh @@ -13,8 +13,8 @@ set -x DISK=$1; shift SSH_KEYS=$1; shift -MAJOR_VERSION=3.13 -MINOR_VERSION=5 +MAJOR_VERSION=3.14 +MINOR_VERSION=0 IMAGE=alpine-minirootfs-$MAJOR_VERSION.$MINOR_VERSION-x86_64.tar.gz RESOLVCONF=/etc/resolv.conf @@ -24,6 +24,19 @@ rootfs_tmpdir=$(mktemp -d) rootfs_url="http://dl-cdn.alpinelinux.org/alpine/v$MAJOR_VERSION/releases/x86_64/$IMAGE" +case $DISK in + /dev/sd*) + partition=${DISK}1 + ;; + /dev/mmcblk*|/dev/nvme*) + partition=${DISK}p1 + ;; + *) + echo "Unsupported disk - edit this script" >&2 + exit 1 + ;; +esac + run_root () { sudo chroot $rootfs_tmpdir /usr/bin/env \ PATH=/sbin:/bin:/usr/sbin:/usr/bin \ @@ -43,9 +56,9 @@ label: dos EOF # For creation, if an existing filesystem is on the partitions -sudo mkfs.ext4 -F ${DISK}1 +sudo mkfs.ext4 -F ${partition} -sudo mount ${DISK}1 $rootfs_tmpdir +sudo mount ${partition} $rootfs_tmpdir # keep right permissions, use sudo sudo tar xf $IMAGE -C $rootfs_tmpdir From 826906bb4237c8ead9afe60cc54eb2c454cdc63e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 29 Jul 2021 16:15:42 +0200 Subject: [PATCH 2/4] [opennebula] initial openSUSE image definition --- .../opensuse-build-opennebula-image.sh | 172 ++++++++++++++++++ 1 file changed, 172 insertions(+) create mode 100755 opennebula-images/opensuse-build-opennebula-image.sh diff --git a/opennebula-images/opensuse-build-opennebula-image.sh b/opennebula-images/opensuse-build-opennebula-image.sh new file mode 100755 index 0000000..aeaf474 --- /dev/null +++ b/opennebula-images/opensuse-build-opennebula-image.sh @@ -0,0 +1,172 @@ +#!/bin/sh + +# This script generates openSUSE images for OpenNebula. +# +# 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=leap +RELEASE_VERSION=15.2 +IMAGE_PATH=opensuse-${RELEASE}${RELEASE_VERSION}-$(date -I).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.12.0.2/one-context-5.12.0.2-1.suse.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 [ "$(lsb_release --short --id)" != "openSUSE" ]; then + echo "WARNING: this script has been designed to run on an openSUSE system." >&2 + echo "WARNING: Not running openSUSE. Giving you 5 seconds to abort." >&2 + sleep 5 +fi + +repo_addr=http://download.opensuse.org +case "$RELEASE" in + leap) + distribution_slice=$RELEASE/$RELEASE_VERSION + oss_repo_url="${repo_addr}/distribution/${distribution_slice}/repo/oss" + ;; + tumbleweed) + distribution_slice=$RELEASE + oss_repo_url="${repo_addr}/${distribution_slice}/repo/oss" + ;; + *) + echo "Unkown openSUSE release: $RELEASE." >&2 + exit 1 + ;; +esac +oss_update_repo_url="${repo_addr}/update/${distribution_slice}/oss" + +# 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/hosts << EOF +127.0.0.1 localhost localhost.localdomain localhost4 localhost4.localdomain4 +::1 localhost localhost.localdomain localhost6 localhost6.localdomain6 + +EOF + +# Install (magic?) one-context RPM and hope things works as expected. +curl -L "$ONE_CONTEXT_RPM_URL" > "/mnt$ONE_CONTEXT_RPM_PATH" +run_root zypper -n --no-gpg-checks install "$ONE_CONTEXT_RPM_PATH" +run_root rm "$ONE_CONTEXT_RPM_PATH" + +# Install resize2fs, which is required to resize the root file-system. +run_root zypper -n install e2fsprogs + +# Initalize base services. +run_root systemd-machine-id-setup + +run_root ln -sf /usr/share/zoneinfo/UTC /etc/localtime +run_root systemctl enable systemd-timesyncd.service + +# Install haveged due to lack of entropy in ONE environment. +run_root zypper -n install haveged +run_root systemctl enable haveged.service + +# Install kernel and bootloader. +run_root zypper -n install kernel-default grub2 + +# Add support for virtio block devices at boot time. +cat > /mnt/etc/dracut.conf.d/virtio-blk.conf <>/mnt/etc/fstab < Date: Thu, 29 Jul 2021 17:01:58 +0200 Subject: [PATCH 3/4] [opennebula] update openSUSE image to Leap 15.3 --- opennebula-images/opensuse-build-opennebula-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opennebula-images/opensuse-build-opennebula-image.sh b/opennebula-images/opensuse-build-opennebula-image.sh index aeaf474..baccbe1 100755 --- a/opennebula-images/opensuse-build-opennebula-image.sh +++ b/opennebula-images/opensuse-build-opennebula-image.sh @@ -10,7 +10,7 @@ set -x # XXX: Handle command-line arguments? RELEASE=leap -RELEASE_VERSION=15.2 +RELEASE_VERSION=15.3 IMAGE_PATH=opensuse-${RELEASE}${RELEASE_VERSION}-$(date -I).img.qcow2 IMAGE_SIZE=10G NBD_DEVICE=/dev/nbd1 From 2e60bbe9d04a630018be4e10b70179398bd30a77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Floure?= Date: Thu, 29 Jul 2021 17:55:27 +0200 Subject: [PATCH 4/4] [opennebula] use base instead of minimal_base pattern for openSUSE image --- opennebula-images/opensuse-build-opennebula-image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opennebula-images/opensuse-build-opennebula-image.sh b/opennebula-images/opensuse-build-opennebula-image.sh index baccbe1..d90774a 100755 --- a/opennebula-images/opensuse-build-opennebula-image.sh +++ b/opennebula-images/opensuse-build-opennebula-image.sh @@ -91,7 +91,7 @@ mount "${NBD_DEVICE}p1" /mnt/boot zypper --root /mnt addrepo $oss_repo_url opensuse-$RELEASE-oss zypper --root /mnt addrepo $oss_update_repo_url opensuse-$RELEASE-oss-update zypper --root /mnt --gpg-auto-import-keys refresh -zypper --root /mnt --non-interactive install -t pattern minimal_base +zypper --root /mnt --non-interactive install -t pattern base mount --bind /dev /mnt/dev mount --bind /dev/pts /mnt/dev/pts