public inbox for development@lists.ipfire.org
 help / color / mirror / Atom feed
From: Stefan Schantl <stefan.schantl@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH 17/17] installer: Adjust BTRFS layout
Date: Fri, 15 Mar 2024 20:14:42 +0100	[thread overview]
Message-ID: <20240315191442.3951-18-stefan.schantl@ipfire.org> (raw)
In-Reply-To: <20240315191442.3951-1-stefan.schantl@ipfire.org>

[-- Attachment #1: Type: text/plain, Size: 923 bytes --]

* 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 <stefan.schantl(a)ipfire.org>
---
 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"},
-- 
2.39.2


  parent reply	other threads:[~2024-03-15 19:14 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-03-15 19:14 [PATCH 00/17] BTRFS support on IPFire 2.x (experimental) Stefan Schantl
2024-03-15 19:14 ` [PATCH 01/17] btrfs-progs: New package Stefan Schantl
2024-03-18 16:02   ` Michael Tremer
2024-03-19 19:53     ` Stefan Schantl
2024-03-15 19:14 ` [PATCH 02/17] installer: Allow to install IPFire on BTRFS Stefan Schantl
2024-03-18 16:03   ` Michael Tremer
2024-03-15 19:14 ` [PATCH 03/17] installer: Ensure to always create the /boot directory Stefan Schantl
2024-03-15 19:14 ` [PATCH 04/17] installer: Disable seperate boot partition Stefan Schantl
2024-03-18 16:05   ` Michael Tremer
2024-03-15 19:14 ` [PATCH 05/17] installer: Add code to create a BTRFS subvolume layout Stefan Schantl
2024-03-18 16:09   ` Michael Tremer
2024-03-19 20:05     ` Stefan Schantl
2024-03-22 16:21       ` Michael Tremer
2024-03-15 19:14 ` [PATCH 06/17] installer: Correctly umount main BTRFS partition Stefan Schantl
2024-03-15 19:14 ` [PATCH 07/17] installer: Add recurisve mkdir function Stefan Schantl
2024-03-15 19:14 ` [PATCH 08/17] installer: Mount BTRFS layout before installing the system Stefan Schantl
2024-03-18 16:11   ` Michael Tremer
2024-03-19 20:09     ` Stefan Schantl
2024-03-15 19:14 ` [PATCH 09/17] installer: Add /var/tmp to the BTRFS layout Stefan Schantl
2024-03-15 19:14 ` [PATCH 10/17] installer: Fix using BTRFS mount options when mounting the layout Stefan Schantl
2024-03-15 19:14 ` [PATCH 11/17] installer: Add code to proper unmount the BTRFS layout Stefan Schantl
2024-03-15 19:14 ` [PATCH 12/17] installer: Add code to correctly write the fstab when installing on BTRFS Stefan Schantl
2024-03-15 19:14 ` [PATCH 13/17] installer: Define common mount options for BTRFS volumes Stefan Schantl
2024-03-18 16:13   ` Michael Tremer
2024-03-19 20:19     ` Stefan Schantl
2024-03-22 16:23       ` Michael Tremer
2024-03-15 19:14 ` [PATCH 14/17] inotify-tools: New package Stefan Schantl
2024-03-15 19:14 ` [PATCH 15/17] grub-btrfs: " Stefan Schantl
2024-03-18 16:13   ` Michael Tremer
2024-03-19 20:21     ` Stefan Schantl
2024-03-20  9:47       ` Michael Tremer
2024-03-25 11:32         ` Michael Tremer
2024-03-15 19:14 ` [PATCH 16/17] installer: Mark BTRFS support as experimental Stefan Schantl
2024-03-18 16:14   ` Michael Tremer
2024-03-15 19:14 ` Stefan Schantl [this message]
2024-03-18 16:18 ` [PATCH 00/17] BTRFS support on IPFire 2.x (experimental) Michael Tremer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240315191442.3951-18-stefan.schantl@ipfire.org \
    --to=stefan.schantl@ipfire.org \
    --cc=development@lists.ipfire.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox