From patchwork Fri Mar 15 19:14:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Schantl X-Patchwork-Id: 7641 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4TxDVD6f5yz3wv4 for ; Fri, 15 Mar 2024 19:15:32 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4TxDV44PTjzFMY; Fri, 15 Mar 2024 19:15:24 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4TxDTs65xSz32qx; Fri, 15 Mar 2024 19:15:13 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature ECDSA (secp384r1)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4TxDTd2rtNz32lh for ; Fri, 15 Mar 2024 19:15:01 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4TxDTc4Y9tzFLb; Fri, 15 Mar 2024 19:15:00 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1710530100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VK+cGQnA7BqnjS/LdJG2RdwbjS2UbCfv1keKg2FI9HQ=; b=gpGaZAuvl8OjcdKK+U5lCdmCpQeM8WHzcGk2CN1F9LfjsAk5nGIFnQogwV74M8c8+v12er YJBDPjjW48NMmSAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1710530100; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=VK+cGQnA7BqnjS/LdJG2RdwbjS2UbCfv1keKg2FI9HQ=; b=wXV9Z8HQ+MV4HjDPI9t+wwVhEDFRSTEw43yPkQgrFAXby8TUXHuZvGAXrf342GmNiVsYme I3/jikDYu+mDdnIxHz26+5GmDCdSAGosPTpu7brGK5FCTOzo9lIgcYIsrR1PcEs/6NI2be DaIGP536uvHTOTlOTJmgAqMsLRtnPFT+dN+JaiwQQrnBy4WQZnCFajNbgjnXH9XaCGlPUC LNl1OyIUKqL0k4CiCFV1INbplN/E3GRCWxu4EdqEP/rKyxoehiu1jQIuBF4qgyS+/w47OM Mj3wSk2rRTWC45k24yQv1eUIlh2u7qUfin2B9Z3GcqUtprNPn0AgxziQkrLGJg== From: Stefan Schantl To: development@lists.ipfire.org Subject: [PATCH 17/17] installer: Adjust BTRFS layout Date: Fri, 15 Mar 2024 20:14:42 +0100 Message-Id: <20240315191442.3951-18-stefan.schantl@ipfire.org> In-Reply-To: <20240315191442.3951-1-stefan.schantl@ipfire.org> References: <20240315191442.3951-1-stefan.schantl@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: ML232QLAT5TAB4C6RJ2M4VZWYCCIEHF3 X-Message-ID-Hash: ML232QLAT5TAB4C6RJ2M4VZWYCCIEHF3 X-MailFrom: stefan.schantl@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: * Rename the fs root to @ to prevent name collision with home directory of user root. * Add @root which contains the home directory of the root user * Add @backup which will contains the created backups Fixes #13608 Signed-off-by: Stefan Schantl --- src/installer/hw.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/installer/hw.c b/src/installer/hw.c index 26c473e9c..4110deccf 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -47,10 +47,12 @@ // Array which contains the subvolumes which will be created when installing // IPFire on a BTRFS. const char* btrfs_subvolumes[8][2] = { - {"@root" ,"/"}, + {"@" ,"/"}, {"@snapshots", "/.snapshots"}, {"@home", "/home"}, + {"@root", "/root"}, {"@cache", "/var/cache"}, + {"@backup", "/var/ipfire/backup"}, {"@lib", "/var/lib"}, {"@logs", "/var/log"}, {"@mails", "/var/mail"},