From patchwork Sun Feb 23 12:22:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Roman Scherer X-Patchwork-Id: 38994 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id F28BC27BBE9; Sun, 23 Feb 2025 12:23:20 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 79D4627BBE2 for ; Sun, 23 Feb 2025 12:23:19 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tmB0j-0001wP-M3; Sun, 23 Feb 2025 07:23:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1tmB0h-0001wF-7d for guix-patches@gnu.org; Sun, 23 Feb 2025 07:23:03 -0500 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1tmB0g-0001CX-7n; Sun, 23 Feb 2025 07:23:02 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=qUaQEptG4Kv6xkCmrWYu8NzpL52Ed8FzFfB8z69Dp9w=; b=aoNvjU/Rtc/fqNll99jeuvM7V0/Tz51p06caNp3UV9/96z6ol4pwaKPj4lK5wQWzu1AwkFoWtvUpAKkRrf0yDd/mxugrtUyPRYWVa68+KBLfYC1MNRoNmhkCKz4MGbhsggaBOoFABqd8xWcvEGD1TfkggK5quZc/e3+T7gKLEuzkxXplR1PUfSzBFR7gBhFCEpRebC13/bOCNeegjgpZ4DClq0axK/Atq309yjqrslXaimJwbdKAtuMwGjfk47DFJgqgYpjXGlp4SZ1FcXntTRXo1naa2gHl7yvn3fp2Og7tkvpKJFpy6zzDJDTiSMxVRlKHMpr7VWRuIIY/hDUChw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1tmB0g-0003Ad-2D; Sun, 23 Feb 2025 07:23:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#76501] [PATCH 1/1] gnu: machine: hetzner: Fix deployment on smaller instances. Resent-From: Roman Scherer Original-Sender: "Debbugs-submit" Resent-CC: ludo@gnu.org, maxim.cournoyer@gmail.com, guix-patches@gnu.org Resent-Date: Sun, 23 Feb 2025 12:23:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76501 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 76501@debbugs.gnu.org Cc: Roman Scherer , me@fabionatali.com, Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer X-Debbugs-Original-Xcc: Ludovic =?utf-8?q?Court=C3=A8s?= , Maxim Cournoyer Received: via spool by 76501-submit@debbugs.gnu.org id=B76501.174031333812109 (code B ref 76501); Sun, 23 Feb 2025 12:23:02 +0000 Received: (at 76501) by debbugs.gnu.org; 23 Feb 2025 12:22:18 +0000 Received: from localhost ([127.0.0.1]:59713 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1tmAzx-00039E-Vi for submit@debbugs.gnu.org; Sun, 23 Feb 2025 07:22:18 -0500 Received: from mail-ed1-x533.google.com ([2a00:1450:4864:20::533]:45350) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1tmAzu-00038s-Hx for 76501@debbugs.gnu.org; Sun, 23 Feb 2025 07:22:15 -0500 Received: by mail-ed1-x533.google.com with SMTP id 4fb4d7f45d1cf-5dee07e51aaso6685889a12.3 for <76501@debbugs.gnu.org>; Sun, 23 Feb 2025 04:22:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=burningswell-com.20230601.gappssmtp.com; s=20230601; t=1740313328; x=1740918128; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=qUaQEptG4Kv6xkCmrWYu8NzpL52Ed8FzFfB8z69Dp9w=; b=x/uuKr8HkAnQjrumI3dm0TWn+554RkxdtJyjLu5n1N07tDjpZ3FtlWCMewbMWOibtj erqZw8EG48kYyBKrzHuq9CyabgzdcESAZu9uBSy1Lj4l0rU7aCE/O99XXRhUtBectVcL oyAcxRchXMhuyoPYpEJsGJ2P3VKHkHO0abyDv3bwq5usyM/Q6uQpHGqaUptK8aiRRodL 10fjVc97YRHC6Ayn0Tm/Iqd8SW3wPU53fEeWvCGv+Nyi5jkgk0bqUfObeWI57zfJg+om RbtVtCefbiYpJpNn1JSMnX4IJRILKER1Jmj120EacARQNy9Ukdatb7uujRxA6ntZ0ug5 ne4g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1740313328; x=1740918128; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=qUaQEptG4Kv6xkCmrWYu8NzpL52Ed8FzFfB8z69Dp9w=; b=uL+biECVlWJFyY0T7VIxN3Qm5aMFhQGPoyooPRKq0tBAnQHa821FrgRWI2hOYROWrH UtHO+cScFZlYQSQ9yRED3fgEC9iQCcICcKiV3ilcNR8EeWl8KTQiXvx3IRHeOn/Kz1FM LPt6hNN/TSoLSEgO6JK8qHCYAW3I1L36x3HDrOe9RwKkn3lSirknNgvOM38+hz8ebYx3 cfFcMElQqOZL3zatmp4zjf3UpdUxcl9Ig9MJAoYIZG2sGBUlmdOyeHPTtfsmSOQiWxZO ROb4VJnlDRB7ue3/QBGSG9mimG+/HGmqxH/zuIhcSkA7zgx7ZAeJgMP/i85F0PSWOdQm LfbQ== X-Gm-Message-State: AOJu0YyyoYybqiLgNeoqNWMD8UJC4gbeWqRR6aipRUrjnNNEgHR6sN9m Fsg60KZB61Hntd36ig+PEIFe95EszHWt9xawlRRIzmYnQrtopN0pe/7zmRIy85n9K0/jKuqHXoj OMw4= X-Gm-Gg: ASbGncsxbLzgM2qNO2acsW8uwxHhjBmV1q6SaaDmSv8Y/jqFq+t3qVnougknRJRTzFI FJkrMsZx0DFG5ivKlegU260CE6bB3FiBW0npOnaaelN368LSPQmH5E/2XFLgAN46RL8pS/np6QF /kdK/MKzQhNhQy9eZ9/ukOIMttqPpWoVQyPCTcePJayyK519GXhXii4hrej0nK7Uv36DeDOaHk/ xjIxyAxo8wfnYH4U7RheQnM5FuiJr1s/upXBgGAcHhhBvuPbAhdyChYqEVY6d/f79bvCPR9cAgL s4q0FDzxe1i/YwmkxSLeVVE/DMQUTgk= X-Google-Smtp-Source: AGHT+IH4HV0kr0CQAhZeJWl4/kDVqWMgRdprG6Tbsv7Z9jnBm5vIT48uGSnku3lTlqaGAM23KyC8Iw== X-Received: by 2002:a05:6402:4606:b0:5dc:cf9b:b033 with SMTP id 4fb4d7f45d1cf-5e0b70bc283mr8427557a12.5.1740313326967; Sun, 23 Feb 2025 04:22:06 -0800 (PST) Received: from precision.. ([2a01:599:102:b293:729a:6bf3:a9eb:445d]) by smtp.gmail.com with ESMTPSA id 4fb4d7f45d1cf-5ded69e7c33sm15758920a12.61.2025.02.23.04.22.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Feb 2025 04:22:06 -0800 (PST) From: Roman Scherer Date: Sun, 23 Feb 2025 13:22:01 +0100 Message-ID: <0c52c7795b0eb7c63b25cc61ecfd8de82c2e995e.1740312673.git.roman@burningswell.com> X-Mailer: git-send-email 2.48.1 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/machine/hetzner.scm (hetzner-machine-rescue-install-os): Avoid out of disk space error by bind mounting /mnt/tmp/gnu/store to /gnu/store. * tests/machine/hetzner.scm: Test with smaller instances. * doc/guix.texi: Mention unsupported instance. Change-Id: If8bfb6733de493b51813b3e82e255849192f7cba --- doc/guix.texi | 4 +++- gnu/machine/hetzner.scm | 9 ++++++++- tests/machine/hetzner.scm | 4 ++-- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index 83ba0f3292..51db3f9c77 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -45361,7 +45361,9 @@ Invoking guix deploy @code{"cx42"} corresponds to a x86_64 server that has 8 VCPUs, 16 GB of memory and 160 GB of storage, while @code{"cax31"} to the AArch64 equivalent. Other server types and their current prices can be found -@uref{https://www.hetzner.com/cloud/#pricing, here}. +@uref{https://www.hetzner.com/cloud/#pricing, here}. The @code{"cpx11"} +server type is currently not supported, since its rescue system is too +small to bootstrap a Guix system from. @item @code{ssh-key} The file name of the SSH private key to use to authenticate with the diff --git a/gnu/machine/hetzner.scm b/gnu/machine/hetzner.scm index 1d9a3f4385..e87149a06a 100644 --- a/gnu/machine/hetzner.scm +++ b/gnu/machine/hetzner.scm @@ -551,6 +551,13 @@ (define (hetzner-machine-rescue-install-os machine ssh-session server) cp /root/.ssh/authorized_keys /mnt/root/.ssh/authorized_keys chmod 600 /mnt/root/.ssh/authorized_keys +# Small instance don't have much disk space. Bind mount the store of the +# resuce system to the tmp directory of the new Guix system. +mkdir -p /mnt/tmp/gnu/store +mkdir -p /gnu/store +mount --bind /mnt/tmp/gnu/store /gnu/store + +apt-get install guix --assume-yes cat > /tmp/guix/deploy/hetzner-os.scm << EOF (use-modules (gnu) (guix utils)) (use-package-modules ssh) @@ -605,7 +612,7 @@ (define (hetzner-machine-rescue-install-packages machine ssh-session) (format #f "#!/usr/bin/env bash set -eo pipefail apt-get update -apt-get install guix cloud-initramfs-growroot --assume-yes")) +apt-get install cloud-initramfs-growroot --assume-yes")) (format #t "successfully installed rescue system packages on '~a'\n" name))) (define (hetzner-machine-delete machine server) diff --git a/tests/machine/hetzner.scm b/tests/machine/hetzner.scm index 39eac4a4d5..1552bcb9a0 100644 --- a/tests/machine/hetzner.scm +++ b/tests/machine/hetzner.scm @@ -64,7 +64,7 @@ (define %arm-machine (environment hetzner-environment-type) (configuration (hetzner-configuration (labels %labels) - (server-type "cax41") + (server-type "cax11") (ssh-key %ssh-key-file))))) (define %x86-machine @@ -76,7 +76,7 @@ (define %x86-machine (environment hetzner-environment-type) (configuration (hetzner-configuration (labels %labels) - (server-type "cpx51") + (server-type "cx22") (ssh-key %ssh-key-file))))) (define (cleanup machine)