DGNum/liminix
14
0
Fork 2
Code Issues 15 Pull requests 7 Projects Releases Packages Wiki Activity Actions

pass rootOptions config as rootflags= kernel cmdline opt

Browse source
This commit is contained in:
Daniel Barlow 2024-01-08 18:54:49 +00:00
parent 63f034e362
commit 228c0a1668
4 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
examples/rotuer.nix
View file

@ -48,6 +48,7 @@ in rec {
]; ];
hostname = "rotuer"; hostname = "rotuer";
rootfsType = "btrfs"; rootfsType = "btrfs";
rootOptions = "subvol=@";
services.hostap = svc.hostapd.build { services.hostap = svc.hostapd.build {
interface = config.hardware.networkInterfaces.wlan; interface = config.hardware.networkInterfaces.wlan;

8
modules/base.nix
View file

@ -47,6 +47,11 @@ in {
"ubifs" "ubifs"
]; ];
}; };
rootOptions = mkOption {
type = types.nullOr types.str;
default = null;
};
boot = { boot = {
commandLine = mkOption { commandLine = mkOption {
type = types.listOf types.nonEmptyStr; type = types.listOf types.nonEmptyStr;
@ -95,7 +100,8 @@ in {
"root=${config.hardware.rootDevice}" "root=${config.hardware.rootDevice}"
"rootfstype=${config.rootfsType}" "rootfstype=${config.rootfsType}"
"fw_devlink=off" "fw_devlink=off"
]; ] ++ lib.optional (config.rootOptions != null) "rootflags=${config.rootOptions}";
users.root = { users.root = {
uid = 0; gid= 0; gecos = "Root of all evaluation"; uid = 0; gid= 0; gecos = "Root of all evaluation";
dir = "/home/root/"; dir = "/home/root/";

9
pkgs/preinit/parseopts.c
View file

@ -95,7 +95,7 @@ int main()
}; };
char *buf; char *buf;
// finds root= rootfstype= rootopts= options // finds root= rootfstype= rootflags= options
buf = strdup("liminix console=ttyS0,115200 panic=10 oops=panic init=/bin/init loglevel=8 root=/dev/ubi0_4 rootfstype=ubifs rootflags=subvol=1 fw_devlink=off mtdparts=phram0:18M(rootfs) phram.phram=phram0,0x40400000,18874368,65536 root=/dev/mtdblock0 foo"); buf = strdup("liminix console=ttyS0,115200 panic=10 oops=panic init=/bin/init loglevel=8 root=/dev/ubi0_4 rootfstype=ubifs rootflags=subvol=1 fw_devlink=off mtdparts=phram0:18M(rootfs) phram.phram=phram0,0x40400000,18874368,65536 root=/dev/mtdblock0 foo");
memset(&opts, '\0', sizeof opts); parseopts(buf, &opts); memset(&opts, '\0', sizeof opts); parseopts(buf, &opts);
expect_equal(opts.device, "/dev/mtdblock0"); expect_equal(opts.device, "/dev/mtdblock0");
@ -115,6 +115,13 @@ int main()
expect_equal(opts.device, "/dev/hda1"); expect_equal(opts.device, "/dev/hda1");
expect_equal(opts.fstype, "ubifs"); expect_equal(opts.fstype, "ubifs");
// works when rootflags is the last option
buf = strdup("liminix fw_devlink=off root=/dev/hda1 rootfstype=ubifs rootflags=subvol=@");
memset(&opts, '\0', sizeof opts); parseopts(buf, &opts);
expect_equal(opts.device, "/dev/hda1");
expect_equal(opts.fstype, "ubifs");
expect_equal(opts.mount_opts, "subvol=@");
buf = strdup("liminix rootfstype=ubifs fw_devlink=off root=/dev/hda1 foo"); buf = strdup("liminix rootfstype=ubifs fw_devlink=off root=/dev/hda1 foo");
memset(&opts, '\0', sizeof opts); parseopts(buf, &opts); memset(&opts, '\0', sizeof opts); parseopts(buf, &opts);
expect_equal(opts.fstype, "ubifs"); expect_equal(opts.fstype, "ubifs");

2
pkgs/preinit/preinit.c
View file

@ -85,7 +85,7 @@ int main(int argc, char *argv[], char *envp[])
write(1, " (", 2); write(1, " (", 2);
write(1, opts.fstype, strlen(opts.fstype)); write(1, opts.fstype, strlen(opts.fstype));
if(opts.mount_opts) { if(opts.mount_opts) {
write(1, ", opts=", 6); write(1, ", opts=", 7);
write(1, opts.mount_opts, strlen(opts.mount_opts)); write(1, opts.mount_opts, strlen(opts.mount_opts));
} }
write(1, ")\n", 2); write(1, ")\n", 2);