From nobody Fri Mar 22 17:03:33 2024 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4V1TDj75WPz5FLxT; Fri, 22 Mar 2024 17:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1TDj6Wqhz4fxj; Fri, 22 Mar 2024 17:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711127013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QdL7mYPcY8YKRrZb1oX61Gq4m/KedFvqPe4/rwBr3qY=; b=OpWv7pGEcJr3nxfTOF4oM7b6iDZEmyOItfa9SnJ2F9lZWUs0KaBzFzXgdWHKkxH5a7FYUg M6T4L9SOBWMJ1KJ9moGoEYBOn1Ad2HbHvJb57rIQJZlCPlWnIYTFECxoe9clObLDOcLxf/ 7i03kAFTCgxtaUtm7+buZNV/1T28bkKfk4nfCO6CpFw+FURsrFW3Vqd5+qViP2ZaREHily vjL6cI8O9mZx0+rK2vqv+3Aq5wrbH+QFkTHBs1YC4SnibZNNzwvrTO1jwHAlgvNPRlIIML pCY826hmvKTmu9RTY1+XeWitbnJkNtlSezLQ9bL+/l273X5YRsbwgKgTn/txqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711127013; a=rsa-sha256; cv=none; b=iMA4TelnIb+ldFaB79akaL9nM8LFUUWTqaQdDXgyRqb7HoWx9kAVjlTNmEDoV55B+JczkT 6hK4XXjNxeD+Dvc1CYyojCOKh4mR899LfbYZ5NqD1fMAqrNPvuhzY5R30grewtB5XXYvrB AP+A7NVu6iyKVoyBuQ9qz5Ayp/pQLE0Yli66c7MKlko6vnKBWTrT7uYPM7TdJD2/lIarRM 6tuBul5xYAeNxB06b79YeVT0BqAUrJoIwTvkO20fMi9wKjcN+hQIwnJZGUrszySJzJbAIR lk7njc9HpLJtUVaClcx7LNJ3hOG0UrYRTdJYIQkEvyOJJ1rLJyM1NfUU3gs6ig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711127013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QdL7mYPcY8YKRrZb1oX61Gq4m/KedFvqPe4/rwBr3qY=; b=TSUdW1IIJLyhJWlTDVXplaS/YckecQXeiGM72Sqm9U5HEZy0S5moPdpm8N85OfGaOKZ2g5 0pLgyT+bhxvyGbNvsRXuI2GxP6znm2cp+zyzNyJXK3WpQOabW1x/RCcUJEGlnr+Y4jM3ra L2y95KCKRxb4Et44QLdMoy85ikP+kDnSwovDXOq3PVtJRM+zgFsBOWYQV4bhOQlnJy+cUy Hoss5AvnHsHW+nNnS6wB30fsJvC0kxF65bAr/lwKhwiz5mboYiZesxOXsOKvSRuVdwaHbv k/gjmmB1novANRfJKTa5Mli9U2+w3MuUpvOb20L9NdpXoXrmn4Qpv8ulMpS6dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4V1TDj67CCz1RRt; Fri, 22 Mar 2024 17:03:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MH3XO3060098; Fri, 22 Mar 2024 17:03:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MH3XPm060095; Fri, 22 Mar 2024 17:03:33 GMT (envelope-from git) Date: Fri, 22 Mar 2024 17:03:33 GMT Message-Id: <202403221703.42MH3XPm060095@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Baptiste Daroussin Subject: git: a977444652a5 - main - cloudinit: fix creation of cloudinit ready VMs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a977444652a59332c53b652b912c38a1d1802b58 Auto-Submitted: auto-generated The branch main has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=a977444652a59332c53b652b912c38a1d1802b58 commit a977444652a59332c53b652b912c38a1d1802b58 Author: Baptiste Daroussin AuthorDate: 2024-03-22 16:58:48 +0000 Commit: Baptiste Daroussin CommitDate: 2024-03-22 17:03:27 +0000 cloudinit: fix creation of cloudinit ready VMs The framework do not support multiple format images, so this last minute addition of qcow2 format was clearly not a good idea. while here fix a typo Reported by: cperciva --- release/Makefile.vm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.vm b/release/Makefile.vm index 2b252aa18c3a..a52e3b9bac81 100644 --- a/release/Makefile.vm +++ b/release/Makefile.vm @@ -30,9 +30,9 @@ AZURE_DESC= Microsoft Azure platform image BASIC-CI_FORMAT= raw BASIC-CI_FSLIST?= ufs BASIC-CI_DESC= Image for CI -BASIC-CLOUDINIT_FORMAT= raw qcow2 +BASIC-CLOUDINIT_FORMAT= raw BASIC-CLOUDINIT_FSLIST?= ufs zfs -BASIC_CLOUDINIT_DESC?= Images for VM with cloudinit disk config support +BASIC-CLOUDINIT_DESC?= Images for VM with cloudinit disk config support EC2_FORMAT= raw EC2_FSLIST?= ufs zfs EC2_FLAVOURS?= BASE CLOUD-INIT