Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump module-linux-apfs-rw

Browse Source 
I should prepare a package that uses ro-by-default like the developer intended.
This commit is contained in:
Bahar KURT
2025-03-31 21:45:11 +00:00
committed by GitHub
parent becb75b652
commit 3697261ef6
3 changed files with 11 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
kernel/drivers/module-linux-apfs-rw/actions.py
+3 -1
View File
@@ -10,8 +10,10 @@ from pisi.actionsapi import pisitools
KDIR = kerneltools.getKernelVersion()
CONFIGS = "-DCONFIG_APFS_RW_ALWAYS"
def build():
autotools.make("KERNEL_DIR=/lib/modules/%s/build" % KDIR)
autotools.make("KERNEL_DIR=/lib/modules/%(kdir)s/build CONFIG=%(configs)s" % { 'kdir': KDIR, 'configs': CONFIGS })
def install():
pisitools.insinto("/lib/modules/%s/extra" % KDIR, "*.ko")
kernel/drivers/module-linux-apfs-rw/files/rw-by-default.patch
-55
View File
@@ -1,55 +0,0 @@
From e9dfb693ab15084c38805631a90730bc8c22dd37 Mon Sep 17 00:00:00 2001
From: Bahar Kurt <kurtbahartr@users.noreply.github.com>
Date: Tue, 22 Oct 2024 10:07:18 +0300
Subject: [PATCH] Enable the experimental write support by default
It looks safe enough for daily usage.
---
super.c | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/super.c b/super.c
index 5fc2b2b..a07be9a 100644
--- a/super.c
+++ b/super.c
@@ -1184,6 +1184,9 @@ static int parse_options(struct super_block *sb, char *options)
/* Set default values before parsing */
nx_flags = 0;
+ /* DOWNSTREAM: Set r/w to be the default. It looks safe and sane enough to me. - Bedirhan */
+ nx_flags |= APFS_READWRITE;
+
if (!options)
goto out;
@@ -1196,10 +1199,13 @@ static int parse_options(struct super_block *sb, char *options)
switch (token) {
case Opt_readwrite:
/*
- * Write support is not safe yet, so keep it disabled
- * unless the user requests it explicitly.
+ * Write support is not safe yet, and it was disabled upstream,
+ * but it looks safe and usable enough for data recovery and
+ * little operations like fixing corrupted files.
*/
- nx_flags |= APFS_READWRITE;
+ //nx_flags |= APFS_READWRITE;
+ apfs_warn(sb, "no need to explicitly state r/w mounts");
+ apfs_notice(sb, "we have already made it the default for you downstream");
break;
case Opt_cknodes:
/*
@@ -1242,9 +1248,9 @@ out:
if (!(sb->s_flags & SB_RDONLY)) {
if (nxi->nx_flags & APFS_READWRITE) {
apfs_notice(sb, "experimental write support is enabled");
+ apfs_notice(sb, "this is default only downstream, and you should blame the packager for loss of written data, not the upstream");
} else {
apfs_warn(sb, "experimental writes disabled to avoid data loss");
- apfs_warn(sb, "if you really want them, check the README");
sb->s_flags |= SB_RDONLY;
}
}
--
2.46.2
kernel/drivers/module-linux-apfs-rw/pspec.xml
+8 -4
View File
@@ -12,13 +12,10 @@
<IsA>driver</IsA>
<Summary>Experimental support for APFS</Summary>
<Description>The Apple File System (APFS) is the copy-on-write filesystem currently used on all Apple devices. This module provides a degree of experimental support on Linux.</Description>
<Archive sha1sum="129a58755480d7c7e8c2edf7af7a2bc12f3cff9c" type="targz">https://github.com/linux-apfs/linux-apfs-rw/archive/refs/tags/v0.3.12.tar.gz</Archive>
<Archive sha1sum="e8d5288ae46f0b8776d95aa0054865d81ccdcbf4" type="targz">https://github.com/linux-apfs/linux-apfs-rw/archive/refs/tags/v0.3.13.tar.gz</Archive>
<BuildDependencies>
<Dependency version="6.6.72">kernel-module-headers</Dependency>
</BuildDependencies>
<Patches>
<Patch>rw-by-default.patch</Patch>
</Patches>
</Source>
<Package>
@@ -36,6 +33,13 @@
</Package>
<History>
<Update release="8">
<Date>2025-04-01</Date>
<Version>0.3.13</Version>
<Comment>Version bump & The rw-by-default is accepted upstream</Comment>
<Name>Bedirhan Kurt</Name>
<Email>bedirhan.kurt@outlook.com</Email>
</Update>
<Update release="7">
<Date>2025-01-18</Date>
<Version>0.3.12</Version>