Hello,

Did you consider that our initramdisk will grow a little bit more with these tools?

You probably want to enable the btrfs module in dracut, as we currently don’t ship this:

config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/80-btrfs.rules config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrfs_device_ready.sh config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrfs_finished.sh config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/btrfs_timeout.sh config/rootfiles/common/dracut:#usr/lib/dracut/modules.d/90btrfs/module-setup.sh

-Michael

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

config/rootfiles/common/btrfs-progs | 33 +++++++++++ lfs/btrfs-progs | 85 +++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 119 insertions(+) create mode 100644 config/rootfiles/common/btrfs-progs create mode 100644 lfs/btrfs-progs

diff --git a/config/rootfiles/common/btrfs-progs b/config/rootfiles/common/btrfs-progs new file mode 100644 index 000000000..04af32d3f --- /dev/null +++ b/config/rootfiles/common/btrfs-progs @@ -0,0 +1,33 @@ +lib/udev/rules.d/64-btrfs-dm.rules +lib/udev/rules.d/64-btrfs-zoned.rules +usr/bin/btrfs +usr/bin/btrfs-convert +usr/bin/btrfs-find-root +usr/bin/btrfs-image +usr/bin/btrfs-map-logical +usr/bin/btrfs-select-super +usr/bin/btrfsck +usr/bin/btrfstune +usr/bin/fsck.btrfs +usr/bin/mkfs.btrfs +#usr/include/btrfs +#usr/include/btrfs/ctree.h +#usr/include/btrfs/ioctl.h +#usr/include/btrfs/kerncompat.h +#usr/include/btrfs/list.h +#usr/include/btrfs/rbtree.h +#usr/include/btrfs/rbtree_types.h +#usr/include/btrfs/send-stream.h +#usr/include/btrfs/send-utils.h +#usr/include/btrfs/send.h +#usr/include/btrfs/version.h +#usr/include/btrfsutil.h +#usr/lib/libbtrfs.a +#usr/lib/libbtrfs.so +usr/lib/libbtrfs.so.0 +usr/lib/libbtrfs.so.0.1 +#usr/lib/libbtrfsutil.a +#usr/lib/libbtrfsutil.so +usr/lib/libbtrfsutil.so.1 +usr/lib/libbtrfsutil.so.1.2.0 +#usr/lib/pkgconfig/libbtrfsutil.pc diff --git a/lfs/btrfs-progs b/lfs/btrfs-progs new file mode 100644 index 000000000..caf8f0b96 --- /dev/null +++ b/lfs/btrfs-progs @@ -0,0 +1,85 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +###############################################################################

+############################################################################### +# Definitions +###############################################################################

+include Config

+VER = 6.7.1

+THISAPP = btrfs-progs-v$(VER) +DL_FILE = $(THISAPP).tar.xz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)

+############################################################################### +# Top-level Rules +###############################################################################

+objects = $(DL_FILE)

+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

+$(DL_FILE)_BLAKE2 = 4e05e9dd80e5531425490970318389aef280f61cc636a80aa2bbc630399afd4f1f3ce649d194822ff93ff4b1774d65a504e3bed6f1426ff60830e4c0d0ac87b0

+install : $(TARGET)

+check : $(patsubst %,$(DIR_CHK)/%,$(objects))

+download :$(patsubst %,$(DIR_DL)/%,$(objects))

+b2 : $(subst %,%_BLAKE2,$(objects))

+dist:

• @$(PAK)

+############################################################################### +# Downloading, checking, b2sum +###############################################################################

+$(patsubst %,$(DIR_CHK)/%,$(objects)) :

• @$(CHECK)

+$(patsubst %,$(DIR_DL)/%,$(objects)) :

• @$(LOAD)

+$(subst %,%_BLAKE2,$(objects)) :

• @$(B2SUM)

+############################################################################### +# Installation Details +###############################################################################

+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

• @$(PREBUILD)
• @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
• $(UPDATE_AUTOMAKE)
• cd $(DIR_APP) && ./autogen.sh
• cd $(DIR_APP) && ./configure \
• --prefix=/usr \
• --disable-documentation \
• --disable-python
• cd $(DIR_APP) && make $(MAKETUNING)
• cd $(DIR_APP) && make install
• @rm -rf $(DIR_APP)
• @$(POSTBUILD)

diff --git a/make.sh b/make.sh index 7b56b7fc8..7e3ea09d1 100755 --- a/make.sh +++ b/make.sh @@ -1711,6 +1711,7 @@ buildipfire() { lfsmake2 perl-URI-Encode lfsmake2 rsnapshot lfsmake2 mympd

• lfsmake2 btrfs-progs

  # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty

-- 2.39.2

Can we have Arne sign off on this?

We could in theory only disable the /boot partition when people have selected btrfs.

The flash image will keep a /boot partition and I don’t like this kind of inconsistencies between different installation types.

-Michael

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

This will merge /boot and / to be on the same partition.

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

src/installer/hw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/installer/hw.c b/src/installer/hw.c index b9ed92459..81be87471 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -490,7 +490,7 @@ static unsigned long long hw_swap_size(struct hw_destination* dest) { }

static unsigned long long hw_boot_size(struct hw_destination* dest) {

• return MB2BYTES(512);

• return 0;

}

static int hw_device_has_p_suffix(const struct hw_destination* dest) {

2.39.2

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

src/installer/hw.c | 70 ++++++++++++++++++++++++++++++++++++++++++++-- src/installer/hw.h | 5 ++++ 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/src/installer/hw.c b/src/installer/hw.c index 81be87471..420feaca7 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -44,6 +44,20 @@

#include "hw.h"

+// Array which contains the subvolumes which will be created when installing +// IPFire on a BTRFS. +const char* btrfs_subvolumes[7][2] = {

• {"@root" ,"/"},
• {"@snapshots", "/.snapshots"},
• {"@home", "/home"},
• {"@cache", "/var/cache"},
• {"@lib", "/var/lib"},
• {"@logs", "/var/log"},
• {"@mails", "/var/mail"}

+};

I would prefer to not allocate these arrays to a specific size. You leave the square brackets empty and the compiler will figure out how much space it needs. That avoids any problems when something is being added later.

You should also NULL-terminate the array.

+#define LEN(arr) ((int) (sizeof (arr) / sizeof (arr)[0]))

static int system_chroot(const char* output, const char* path, const char* cmd) { char chroot_cmd[STRING_SIZE];

@@ -805,6 +819,7 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) {

static int hw_format_filesystem(const char* path, int fs, const char* output) { char cmd[STRING_SIZE] = "\0";

• int r;

// Swap if (fs == HW_FS_SWAP) { @@ -824,7 +839,9 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {

// BTRFS } else if (fs == HW_FS_BTRFS) {

• snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -L rootfs -f %s", path);

• r = hw_create_btrfs_layout(path, output);
• return r;

// FAT32 } else if (fs == HW_FS_FAT32) { @@ -833,7 +850,7 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {

assert(*cmd);

• int r = mysystem(output, cmd);

• r = mysystem(output, cmd);

return r; } @@ -870,6 +887,43 @@ int hw_create_filesystems(struct hw_destination* dest, const char* output) { return 0; }

+int hw_create_btrfs_layout(const char* path, const char* output) {

• char cmd[STRING_SIZE];
• char subvolume[STRING_SIZE];
• // Create the main BTRFS.
• snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -L IPFire -f %s", path);

Again, you are using a label here. Is that a requirement?

• int r = mysystem(output, cmd);
• if (r)
• return r;
• // We need to mount the FS in order to create any subvolumes.
• r = hw_mount(path, DESTINATION_MOUNT_PATH, "btrfs", 0);
• if (r)
• return r;
• // Loop through the array of subvolumes to create.
• for ( int i = 0; i < LEN(btrfs_subvolumes); i++ ) {

If you NULL-terminate your array, you won’t need the LEN() macro which I personally don’t consider good style.

• snprintf(subvolume, sizeof(subvolume), "%s", btrfs_subvolumes[i][0]);

I know that the installer isn’t doing that very much, but you should check the return code of snprintf().

• // Call function to create the subvolume
• r = hw_create_btrfs_subvolume(output, subvolume);
• if (r)
• return r;
• }
• // Umount the main BTRFS after subvolume creation.
• r = hw_umount(path, 0);
• if (r)
• return r;
• return 0;

+}

int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { char target[STRING_SIZE];

@@ -1219,3 +1273,15 @@ int hw_restore_backup(const char* output, const char* backup_path, const char* d

return 0; }

+int hw_create_btrfs_subvolume(const char* output, const char* subvolume) {

• char command [STRING_SIZE];
• snprintf(command, sizeof(command), "/usr/bin/btrfs subvolume create %s/%s", DESTINATION_MOUNT_PATH, subvolume);

Likewise.

• int r = mysystem(output, command);
• if (r)
• return -1;
• return 0;

+} diff --git a/src/installer/hw.h b/src/installer/hw.h index e5ee65a6d..2de73a3be 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -104,6 +104,8 @@ struct hw_destination { unsigned long long size_root; };

+extern const char* btrfs_subvolumes[][2];

Please declare the array statically and you won’t need this.

struct hw* hw_init(); void hw_free(struct hw* hw);

@@ -143,4 +145,7 @@ int hw_start_networking(const char* output);

void hw_sync();

+int hw_create_btrfs_layout(const char* output, const char* subvolume); +int hw_create_btrfs_subvolume(const char* output, const char* subvolume);

#endif /* HEADER_HW_H */

2.39.2

On 19 Mar 2024, at 20:05, Stefan Schantl stefan.schantl@ipfire.org wrote:

Hello,

...

...

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

src/installer/hw.c | 70 ++++++++++++++++++++++++++++++++++++++++++++-- src/installer/hw.h | 5 ++++ 2 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/src/installer/hw.c b/src/installer/hw.c index 81be87471..420feaca7 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -44,6 +44,20 @@

#include "hw.h"

+// Array which contains the subvolumes which will be created when installing +// IPFire on a BTRFS. +const char* btrfs_subvolumes[7][2] = {

• {"@root" ,"/"},
• {"@snapshots", "/.snapshots"},
• {"@home", "/home"},
• {"@cache", "/var/cache"},
• {"@lib", "/var/lib"},
• {"@logs", "/var/log"},
• {"@mails", "/var/mail"}

+};

I would prefer to not allocate these arrays to a specific size. You leave the square brackets empty and the compiler will figure out how much space it needs. That avoids any problems when something is being added later.

You should also NULL-terminate the array.

Thanks for the hint, I'll adjust the code to use it in this way.

...

...

+#define LEN(arr) ((int) (sizeof (arr) / sizeof (arr)[0]))

static int system_chroot(const char* output, const char* path, const char* cmd) { char chroot_cmd[STRING_SIZE];

@@ -805,6 +819,7 @@ int hw_create_partitions(struct hw_destination* dest, const char* output) {

static int hw_format_filesystem(const char* path, int fs, const char* output) { char cmd[STRING_SIZE] = "\0";

• int r;

// Swap if (fs == HW_FS_SWAP) { @@ -824,7 +839,9 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {

// BTRFS } else if (fs == HW_FS_BTRFS) {

• snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -L rootfs -f %s",

path);

• r = hw_create_btrfs_layout(path, output);
• return r;

// FAT32 } else if (fs == HW_FS_FAT32) { @@ -833,7 +850,7 @@ static int hw_format_filesystem(const char* path, int fs, const char* output) {

assert(*cmd);

• int r = mysystem(output, cmd);

• r = mysystem(output, cmd);

return r; } @@ -870,6 +887,43 @@ int hw_create_filesystems(struct hw_destination* dest, const char* output) { return 0; }

+int hw_create_btrfs_layout(const char* path, const char* output) {

• char cmd[STRING_SIZE];
• char subvolume[STRING_SIZE];
• // Create the main BTRFS.
• snprintf(cmd, sizeof(cmd), "/usr/bin/mkfs.btrfs -L IPFire -f %s",

path);

Again, you are using a label here. Is that a requirement?

There is not a strict requirement on using a label. I added one as some kind of nice to have to indicate the main IPFire file system.

As it is optional I also can drop the label, your opinion?

I would like to keep it consistent. Either remove it from btrfs, or add it to the others.

Since it is not serving any purpose I would rather remove it.

...

...

• int r = mysystem(output, cmd);
• if (r)
• return r;
• // We need to mount the FS in order to create any subvolumes.
• r = hw_mount(path, DESTINATION_MOUNT_PATH, "btrfs", 0);
• if (r)
• return r;
• // Loop through the array of subvolumes to create.
• for ( int i = 0; i < LEN(btrfs_subvolumes); i++ ) {

If you NULL-terminate your array, you won’t need the LEN() macro which I personally don’t consider good style.

...

• snprintf(subvolume, sizeof(subvolume), "%s",

btrfs_subvolumes[i][0]);

I know that the installer isn’t doing that very much, but you should check the return code of snprintf().

Thanks I'll add some checking code.

...

...

• // Call function to create the subvolume
• r = hw_create_btrfs_subvolume(output, subvolume);
• if (r)
• return r;
• }
• // Umount the main BTRFS after subvolume creation.
• r = hw_umount(path, 0);
• if (r)
• return r;
• return 0;

+}

int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { char target[STRING_SIZE];

@@ -1219,3 +1273,15 @@ int hw_restore_backup(const char* output, const char* backup_path, const char* d

return 0; }

+int hw_create_btrfs_subvolume(const char* output, const char* subvolume) {

• char command [STRING_SIZE];
• snprintf(command, sizeof(command), "/usr/bin/btrfs subvolume

create %s/%s", DESTINATION_MOUNT_PATH, subvolume);

Likewise.

...

• int r = mysystem(output, command);
• if (r)
• return -1;
• return 0;

+} diff --git a/src/installer/hw.h b/src/installer/hw.h index e5ee65a6d..2de73a3be 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -104,6 +104,8 @@ struct hw_destination { unsigned long long size_root; };

+extern const char* btrfs_subvolumes[][2];

Please declare the array statically and you won’t need this.

...

struct hw* hw_init(); void hw_free(struct hw* hw);

@@ -143,4 +145,7 @@ int hw_start_networking(const char* output);

void hw_sync();

+int hw_create_btrfs_layout(const char* output, const char* subvolume); +int hw_create_btrfs_subvolume(const char* output, const char* subvolume);

#endif /* HEADER_HW_H */

2.39.2

• Stefan

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

src/installer/hw.c | 48 +++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 45 insertions(+), 3 deletions(-)

diff --git a/src/installer/hw.c b/src/installer/hw.c index cb6a8ab81..e520fb687 100644 --- a/src/installer/hw.c +++ b/src/installer/hw.c @@ -926,6 +926,7 @@ int hw_create_btrfs_layout(const char* path, const char* output) {

int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { char target[STRING_SIZE];

• int r;

assert(*prefix == '/');

@@ -953,9 +954,17 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { }

// root

• int r = hw_mount(dest->part_root, prefix, filesystem, 0);
• if (r)
• return r;

• if (dest->filesystem == HW_FS_BTRFS) {
• r = hw_mount_btrfs_subvolumes(dest->part_root);
• if (r)
• return r;
• } else {
• r = hw_mount(dest->part_root, prefix, filesystem, 0);
• if (r)
• return r;
• }

// boot snprintf(target, sizeof(target), "%s%s", prefix, HW_PATH_BOOT); @@ -1019,6 +1028,39 @@ int hw_mount_filesystems(struct hw_destination* dest, const char* prefix) { return 0; }

+int hw_mount_btrfs_subvolumes(const char* source) {

• int r;
• char path[STRING_SIZE];
• char options[STRING_SIZE];
• // Mount the root subvolume
• snprintf(options, sizeof(options), "subvol=%s,%s", btrfs_subvolumes[0][0], BTRFS_MOUNT_OPTIONS);
• r = mount(source, DESTINATION_MOUNT_PATH, "btrfs", NULL, options);

Why is this not inside the loop when it is just a regular subvolume?

• if (r)
• return r;
• // Loop through the remain array of known subvolumes.
• for ( int i = 1; i < LEN(btrfs_subvolumes); i++ ) {
• snprintf(path, sizeof(path), "%s%s", DESTINATION_MOUNT_PATH, btrfs_subvolumes[i][1]);
• snprintf(options, sizeof(options), "subvol=%s,", btrfs_subvolumes[i][0], BTRFS_MOUNT_OPTIONS);

Likewise, please check the return code of snprintf.

• // Create the directory.
• r = hw_mkdir(path, S_IRWXU|S_IRWXG|S_IRWXO);
• if(r != 0 && errno != EEXIST)
• return r;
• // Try to mount the subvolume.
• r = mount(source, path, "btrfs", NULL, options);
• if (r)
• return r;
• }
• return 0;

+}

int hw_umount_filesystems(struct hw_destination* dest, const char* prefix) { int r; char target[STRING_SIZE]; -- 2.39.2

Am Montag, dem 18.03.2024 um 16:13 +0000 schrieb Michael Tremer:

Hello,

...

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

As default we are using zstd for compression with level 1

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

src/installer/hw.h | 2 ++ 1 file changed, 2 insertions(+)

diff --git a/src/installer/hw.h b/src/installer/hw.h index 2de73a3be..402e5cd0d 100644 --- a/src/installer/hw.h +++ b/src/installer/hw.h @@ -54,6 +54,8 @@

#define SERIAL_BAUDRATE               115200

+#define BTRFS_MOUNT_OPTIONS           "compress=zstd:1"

Is there no way to configure this in the filesystem when it is being created to be used as default?

SBTRFS provides the freedom to the user to tell which kind of compression, the used algorithm and the compression ration should be used by specifying this at mount time.

It also would be possible to change this at any later time by just change the mount option. (This only would affect newly created files.)

So yes, it is possible to start with zstd, switch over to xz, gz and finally uncompressed data on the same volume.

Reading through the BTRFS documentation, there is no option to persistant set the compression details.

https://btrfs.readthedocs.io/en/latest/Compression.html

I think it would be nicer to have a less busy /etc/fstab.

If I did not miss anything while reading the docs, we have to live with this or disable compression.

...

#define BYTES2MB(x) ((x) / 1024 / 1024) #define MB2BYTES(x) ((unsigned long long)(x) * 1024 * 1024)

-- 2.39.2

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

This kind of grub addon will extend the grub boot menu by a additional submenu where a BTRFS snapshot can be selected to directly use as root volume and boot into it.

The grub-btrfsd daemon is using inotify(tools) to watch the snapshot directory for new or deleted snapshots and calls grub-mkconfig to adjust the snapshot grub submenu

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

config/rootfiles/common/grub-btrfs | 14 ++++ config/rootfiles/common/x86_64/initscripts | 4 ++ lfs/grub-btrfs | 79 ++++++++++++++++++++++ lfs/initscripts | 3 + make.sh | 1 + src/initscripts/system/grub-btrfsd | 61 +++++++++++++++++ 6 files changed, 162 insertions(+) create mode 100644 config/rootfiles/common/grub-btrfs create mode 100644 lfs/grub-btrfs create mode 100644 src/initscripts/system/grub-btrfsd

diff --git a/config/rootfiles/common/grub-btrfs b/config/rootfiles/common/grub-btrfs new file mode 100644 index 000000000..a612af065 --- /dev/null +++ b/config/rootfiles/common/grub-btrfs @@ -0,0 +1,14 @@ +boot/grub/grubenv +etc/default/grub-btrfs +etc/default/grub-btrfs/config +etc/grub.d/41_snapshots-btrfs +usr/bin/grub-btrfsd +#usr/lib/systemd/system/grub-btrfsd.service +#usr/share/doc/grub-btrfs +#usr/share/doc/grub-btrfs/README.md +#usr/share/doc/grub-btrfs/initramfs-overlayfs.md +#usr/share/licenses +#usr/share/licenses/grub-btrfs +#usr/share/licenses/grub-btrfs/LICENSE +#usr/share/man/man8/grub-btrfs.8.bz2 +#usr/share/man/man8/grub-btrfsd.8.bz2 diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index a5e1596fb..2d6fa85dc 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -26,6 +26,7 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/firstsetup etc/rc.d/init.d/fsresize etc/rc.d/init.d/functions +etc/rc.d/init.d/grub-btrfsd etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds @@ -92,6 +93,7 @@ etc/rc.d/init.d/vnstat etc/rc.d/init.d/waitdrives etc/rc.d/init.d/wlanclient #etc/rc.d/rc0.d +etc/rc.d/rc0.d/K01grub-btrfsd #etc/rc.d/rc0.d/K01imspetor #etc/rc.d/rc0.d/K01motion #etc/rc.d/rc0.d/K01vdradmin @@ -135,10 +137,12 @@ etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc3.d/S98sslh +etc/rc.d/rc3.d/S99grub-btrfsd #etc/rc.d/rc3.d/S99imspetor #etc/rc.d/rc3.d/S99motion #etc/rc.d/rc3.d/S99vdradmin #etc/rc.d/rc6.d +etc/rc.d/rc6.d/K01grub-btrfsd #etc/rc.d/rc6.d/K01imspetor #etc/rc.d/rc6.d/K01motion #etc/rc.d/rc6.d/K01vdradmin diff --git a/lfs/grub-btrfs b/lfs/grub-btrfs new file mode 100644 index 000000000..8dc0c4f3e --- /dev/null +++ b/lfs/grub-btrfs @@ -0,0 +1,79 @@ +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +###############################################################################

+############################################################################### +# Definitions +###############################################################################

+include Config

+VER = 4.13

+THISAPP = grub-btrfs-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)

+############################################################################### +# Top-level Rules +###############################################################################

+objects = $(DL_FILE)

+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

+$(DL_FILE)_BLAKE2 = e2f11a0a8282e3ec8ff8223e3bad70b5d5c5e81b4d740a1bf3554db412dbe48a8a0f216f4e6c65ae1d11c01a27b8b92bae9b470c60d2389505ce089511536e1a

+install : $(TARGET)

+check : $(patsubst %,$(DIR_CHK)/%,$(objects))

+download :$(patsubst %,$(DIR_DL)/%,$(objects))

+b2 : $(subst %,%_BLAKE2,$(objects))

+dist:

• @$(PAK)

+############################################################################### +# Downloading, checking, b2sum +###############################################################################

+$(patsubst %,$(DIR_CHK)/%,$(objects)) :

• @$(CHECK)

+$(patsubst %,$(DIR_DL)/%,$(objects)) :

• @$(LOAD)

+$(subst %,%_BLAKE2,$(objects)) :

• @$(B2SUM)

+############################################################################### +# Installation Details +###############################################################################

+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

• @$(PREBUILD)
• @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
• $(UPDATE_AUTOMAKE)
• cd $(DIR_APP) && make install
• @rm -rf $(DIR_APP)
• @$(POSTBUILD)

diff --git a/lfs/initscripts b/lfs/initscripts index e078632ab..4d67ee0c4 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -91,6 +91,7 @@ $(TARGET) : install -v -m 755 $$i /etc/rc.d/helper/; \ done

• ln -sf ../init.d/grub-btrfsd /etc/rc.d/rc0.d/K01grub-btrfsd

ln -sf ../init.d/imspetor /etc/rc.d/rc0.d/K01imspetor ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion ln -sf ../init.d/vdradmin /etc/rc.d/rc0.d/K01vdradmin @@ -132,10 +133,12 @@ $(TARGET) : ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh

• ln -sf ../init.d/grub-btrfsd /etc/rc.d/rc3.d/S99grub-btrfsd

ln -sf ../init.d/imspetor /etc/rc.d/rc3.d/S99imspetor ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion ln -sf ../init.d/vdradmin /etc/rc.d/rc3.d/S99vdradmin

• ln -sf ../init.d/grub-btrfsd /etc/rc.d/rc6.d/K01grub-btrfsd

ln -sf ../init.d/imspetor /etc/rc.d/rc6.d/K01imspetor ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion ln -sf ../init.d/vdradmin /etc/rc.d/rc6.d/K01vdradmin diff --git a/make.sh b/make.sh index 30bd5f16b..0aa3d26af 100755 --- a/make.sh +++ b/make.sh @@ -1713,6 +1713,7 @@ buildipfire() { lfsmake2 mympd lfsmake2 btrfs-progs lfsmake2 inotify-tools

• lfsmake2 grub-btrfs

  # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty

diff --git a/src/initscripts/system/grub-btrfsd b/src/initscripts/system/grub-btrfsd new file mode 100644 index 000000000..833f90cb1 --- /dev/null +++ b/src/initscripts/system/grub-btrfsd @@ -0,0 +1,61 @@ +#!/bin/sh +############################################################################### +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +###############################################################################

+. /etc/sysconfig/rc +. ${rc_functions}

+SNAPSHOTDIR="/.snapshots" +PIDFILE="/run/grub-btrfsd.pid"

+root_is_btrfs() {

• [ "$(stat -f --format="%T" /)" == "btrfs" ] || return 1
• return 0

+}

+case "$1" in

•    start)
  

• root_is_btrfs || exit 0
• boot_mesg "Starting grub-btrfsd..."

Please give this a more human-readable name. Like the other services :)

• loadproc -b -p "$PIDFILE" /usr/bin/grub-btrfsd --syslog "$SNAPSHOTDIR"
• # Store the gained PID to the defined pidfile
• echo "$!" > "$PIDFILE"
• ;;
• stop)
• boot_mesg "Stopping grub-btrfsd..."
• killproc -p "$PIDFILE" /usr/bin/grub-btrfsd
• sleep 1;
• ;;
• restart)
• $0 stop
• sleep 2
• $0 start
• ;;
• *)
• echo "Usage: $0 {start|stop|restart}"
• exit 1
• ;;

+esac

2.39.2

Btrfs Snapshot Daemon?

GRUB/Btrfs Daemon?

Are we spelling btrfs lowercase everywhere? Wikipedia seems to have gone for a capital B, rest lowercase.

https://en.wikipedia.org/wiki/Btrfs

-Michael

On 19 Mar 2024, at 20:21, Stefan Schantl stefan.schantl@ipfire.org wrote:

Am Montag, dem 18.03.2024 um 16:13 +0000 schrieb Michael Tremer:

...

...

On 15 Mar 2024, at 19:14, Stefan Schantl stefan.schantl@ipfire.org wrote:

This kind of grub addon will extend the grub boot menu by a additional submenu where a BTRFS snapshot can be selected to directly use as root volume and boot into it.

The grub-btrfsd daemon is using inotify(tools) to watch the snapshot directory for new or deleted snapshots and calls grub-mkconfig to adjust the snapshot grub submenu

Signed-off-by: Stefan Schantl stefan.schantl@ipfire.org

config/rootfiles/common/grub-btrfs | 14 ++++ config/rootfiles/common/x86_64/initscripts | 4 ++ lfs/grub-btrfs | 79 ++++++++++++++++++++++ lfs/initscripts | 3 + make.sh | 1 + src/initscripts/system/grub-btrfsd | 61 +++++++++++++++++ 6 files changed, 162 insertions(+) create mode 100644 config/rootfiles/common/grub-btrfs create mode 100644 lfs/grub-btrfs create mode 100644 src/initscripts/system/grub-btrfsd

diff --git a/config/rootfiles/common/grub-btrfs b/config/rootfiles/common/grub-btrfs new file mode 100644 index 000000000..a612af065 --- /dev/null +++ b/config/rootfiles/common/grub-btrfs @@ -0,0 +1,14 @@ +boot/grub/grubenv +etc/default/grub-btrfs +etc/default/grub-btrfs/config +etc/grub.d/41_snapshots-btrfs +usr/bin/grub-btrfsd +#usr/lib/systemd/system/grub-btrfsd.service +#usr/share/doc/grub-btrfs +#usr/share/doc/grub-btrfs/README.md +#usr/share/doc/grub-btrfs/initramfs-overlayfs.md +#usr/share/licenses +#usr/share/licenses/grub-btrfs +#usr/share/licenses/grub-btrfs/LICENSE +#usr/share/man/man8/grub-btrfs.8.bz2 +#usr/share/man/man8/grub-btrfsd.8.bz2 diff --git a/config/rootfiles/common/x86_64/initscripts b/config/rootfiles/common/x86_64/initscripts index a5e1596fb..2d6fa85dc 100644 --- a/config/rootfiles/common/x86_64/initscripts +++ b/config/rootfiles/common/x86_64/initscripts @@ -26,6 +26,7 @@ etc/rc.d/init.d/firewall etc/rc.d/init.d/firstsetup etc/rc.d/init.d/fsresize etc/rc.d/init.d/functions +etc/rc.d/init.d/grub-btrfsd etc/rc.d/init.d/halt etc/rc.d/init.d/ipsec etc/rc.d/init.d/leds @@ -92,6 +93,7 @@ etc/rc.d/init.d/vnstat etc/rc.d/init.d/waitdrives etc/rc.d/init.d/wlanclient #etc/rc.d/rc0.d +etc/rc.d/rc0.d/K01grub-btrfsd #etc/rc.d/rc0.d/K01imspetor #etc/rc.d/rc0.d/K01motion #etc/rc.d/rc0.d/K01vdradmin @@ -135,10 +137,12 @@ etc/rc.d/rc3.d/S32apache etc/rc.d/rc3.d/S40fcron etc/rc.d/rc3.d/S98rc.local #etc/rc.d/rc3.d/S98sslh +etc/rc.d/rc3.d/S99grub-btrfsd #etc/rc.d/rc3.d/S99imspetor #etc/rc.d/rc3.d/S99motion #etc/rc.d/rc3.d/S99vdradmin #etc/rc.d/rc6.d +etc/rc.d/rc6.d/K01grub-btrfsd #etc/rc.d/rc6.d/K01imspetor #etc/rc.d/rc6.d/K01motion #etc/rc.d/rc6.d/K01vdradmin diff --git a/lfs/grub-btrfs b/lfs/grub-btrfs new file mode 100644 index 000000000..8dc0c4f3e --- /dev/null +++ b/lfs/grub-btrfs @@ -0,0 +1,79 @@ +################################################################## ############# +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2023 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +################################################################## #############

+################################################################## ############# +# Definitions +################################################################## #############

+include Config

+VER = 4.13

+THISAPP = grub-btrfs-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP)

+################################################################## ############# +# Top-level Rules +################################################################## #############

+objects = $(DL_FILE)

+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)

+$(DL_FILE)_BLAKE2 = e2f11a0a8282e3ec8ff8223e3bad70b5d5c5e81b4d740a1bf3554db412dbe48a8a0 f216f4e6c65ae1d11c01a27b8b92bae9b470c60d2389505ce089511536e1a

+install : $(TARGET)

+check : $(patsubst %,$(DIR_CHK)/%,$(objects))

+download :$(patsubst %,$(DIR_DL)/%,$(objects))

+b2 : $(subst %,%_BLAKE2,$(objects))

+dist:

• @$(PAK)

+################################################################## ############# +# Downloading, checking, b2sum +################################################################## #############

+$(patsubst %,$(DIR_CHK)/%,$(objects)) :

• @$(CHECK)

+$(patsubst %,$(DIR_DL)/%,$(objects)) :

• @$(LOAD)

+$(subst %,%_BLAKE2,$(objects)) :

• @$(B2SUM)

+################################################################## ############# +# Installation Details +################################################################## #############

+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))

• @$(PREBUILD)
• @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar axf

$(DIR_DL)/$(DL_FILE)

• $(UPDATE_AUTOMAKE)
• cd $(DIR_APP) && make install
• @rm -rf $(DIR_APP)
• @$(POSTBUILD)

diff --git a/lfs/initscripts b/lfs/initscripts index e078632ab..4d67ee0c4 100644 --- a/lfs/initscripts +++ b/lfs/initscripts @@ -91,6 +91,7 @@ $(TARGET) : install -v -m 755 $$i /etc/rc.d/helper/; \ done

• ln -sf ../init.d/grub-btrfsd /etc/rc.d/rc0.d/K01grub-btrfsd

ln -sf ../init.d/imspetor /etc/rc.d/rc0.d/K01imspetor ln -sf ../init.d/motion /etc/rc.d/rc0.d/K01motion ln -sf ../init.d/vdradmin /etc/rc.d/rc0.d/K01vdradmin @@ -132,10 +133,12 @@ $(TARGET) : ln -sf ../init.d/fcron /etc/rc.d/rc3.d/S40fcron ln -sf ../../sysconfig/rc.local /etc/rc.d/rc3.d/S98rc.local ln -sf ../init.d/sslh /etc/rc.d/rc3.d/S98sslh

• ln -sf ../init.d/grub-btrfsd /etc/rc.d/rc3.d/S99grub-btrfsd

ln -sf ../init.d/imspetor /etc/rc.d/rc3.d/S99imspetor ln -sf ../init.d/motion /etc/rc.d/rc3.d/S99motion ln -sf ../init.d/vdradmin /etc/rc.d/rc3.d/S99vdradmin

• ln -sf ../init.d/grub-btrfsd /etc/rc.d/rc6.d/K01grub-btrfsd

ln -sf ../init.d/imspetor /etc/rc.d/rc6.d/K01imspetor ln -sf ../init.d/motion /etc/rc.d/rc6.d/K01motion ln -sf ../init.d/vdradmin /etc/rc.d/rc6.d/K01vdradmin diff --git a/make.sh b/make.sh index 30bd5f16b..0aa3d26af 100755 --- a/make.sh +++ b/make.sh @@ -1713,6 +1713,7 @@ buildipfire() { lfsmake2 mympd lfsmake2 btrfs-progs lfsmake2 inotify-tools

• lfsmake2 grub-btrfs

  # Kernelbuild ... current we have no platform that need # multi kernel builds so KCFG is empty

diff --git a/src/initscripts/system/grub-btrfsd b/src/initscripts/system/grub-btrfsd new file mode 100644 index 000000000..833f90cb1 --- /dev/null +++ b/src/initscripts/system/grub-btrfsd @@ -0,0 +1,61 @@ +#!/bin/sh +################################################################## ############# +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2024 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +################################################################## #############

+. /etc/sysconfig/rc +. ${rc_functions}

+SNAPSHOTDIR="/.snapshots" +PIDFILE="/run/grub-btrfsd.pid"

+root_is_btrfs() {

• [ "$(stat -f --format="%T" /)" == "btrfs" ] || return 1
• return 0

+}

+case "$1" in

•    start)
  

• root_is_btrfs || exit 0
• boot_mesg "Starting grub-btrfsd..."

Please give this a more human-readable name. Like the other services :)

Okay, any suggestions?

...

...

• loadproc -b -p "$PIDFILE" /usr/bin/grub-btrfsd --syslog

"$SNAPSHOTDIR"

• # Store the gained PID to the defined pidfile
• echo "$!" > "$PIDFILE"
• ;;
• stop)
• boot_mesg "Stopping grub-btrfsd..."
• killproc -p "$PIDFILE" /usr/bin/grub-btrfsd
• sleep 1;
• ;;
• restart)
• $0 stop
• sleep 2
• $0 start
• ;;
• *)
• echo "Usage: $0 {start|stop|restart}"
• exit 1
• ;;

+esac

2.39.2