Skip to contentSkip to conversation

static-nodes: add shell consumable format

PATCH In review Dave Reisner 4 participants 5 messages Sep 19, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 static-nodes: add shell consumable format

This adds an additional format to kmod static-nodes, which writes output as shell commands, e.g.:

mknod '/dev/btrfs-control' c 10 234
mknod '/dev/loop-control' c 10 237
mkdir -m 755 -p '/dev/net'
mknod '/dev/net/tun' c 10 200

Consumers of this format can simply pipe the output to a shell, creating the necessary static nodes. This could be useful for an initramfs which doesn't have systemd-tmpfiles but which still relies on static node creation which recent udev will no longer handle.

---
 tools/static-nodes.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
tools/static-nodes.c +24 -0
index 0195390..2d68537 100644
@@ -43,11 +43,13 @@ struct static_nodes_format {
 static const struct static_nodes_format static_nodes_format_human;
 static const struct static_nodes_format static_nodes_format_tmpfiles;
 static const struct static_nodes_format static_nodes_format_devname;
+static const struct static_nodes_format static_nodes_format_shell;
 
 static const struct static_nodes_format *static_nodes_formats[] = {
 	&static_nodes_format_human,
 	&static_nodes_format_tmpfiles,
 	&static_nodes_format_devname,
+	&static_nodes_format_shell,
 };
 
 static const char cmdopts_s[] = "o:f:h";
@@ -126,6 +128,28 @@ static const struct static_nodes_format static_nodes_format_devname = {
 	.description = "the modules.devname format.",
 };
 
+static int write_shell(FILE *out, char modname[], char devname[], char type, unsigned int maj, unsigned int min)
+{
+	const char *dir = strrchr(devname, '/');
+
+	if (dir) {
+		if (fprintf(out, "mkdir -m 755 -p '/dev/%.*s'\n",
+					(int)(dir - devname), devname) < 0)
+			return EXIT_FAILURE;
+	}
+
+	if (fprintf(out, "mknod '/dev/%s' %c %u %u\n", devname, type, maj, min) < 0)
+		return EXIT_FAILURE;
+
+	return EXIT_SUCCESS;
+}
+
+static const struct static_nodes_format static_nodes_format_shell = {
+	.name = "shell",
+	.write = write_shell,
+	.description = "mknod commands for consumption by a shell.",
+};
+
 static void help(void)
 {
 	size_t i;
Signature · 1 line
1.8.4
#1 lore raw
Quoted 8 lines · Dave Reisner

This adds an additional format to kmod static-nodes, which writes output as shell commands, e.g.:

mknod '/dev/btrfs-control' c 10 234
mknod '/dev/loop-control' c 10 237
mkdir -m 755 -p '/dev/net'
mknod '/dev/net/tun' c 10 200

Quoted 4 lines

Consumers of this format can simply pipe the output to a shell, creating the necessary static nodes. This could be useful for an initramfs which doesn't have systemd-tmpfiles but which still relies on static node creation which recent udev will no longer handle.

I got a similar request from Harald (CC'ed), but instead to create the nodes ourselves.

The way you did fits better with the current purpose of the static-nodes, but I'm ok with creating the nodes ourselves, too.

Harald, would this work for you as well?

Lucas De Marchi

#2 lore raw
Quoted 14 lines · Lucas De Marchi
Quoted 8 lines · Dave Reisner

This adds an additional format to kmod static-nodes, which writes output as shell commands, e.g.:

mknod '/dev/btrfs-control' c 10 234
mknod '/dev/loop-control' c 10 237
mkdir -m 755 -p '/dev/net'
mknod '/dev/net/tun' c 10 200

Quoted 4 lines

Consumers of this format can simply pipe the output to a shell, creating the necessary static nodes. This could be useful for an initramfs which doesn't have systemd-tmpfiles but which still relies on static node creation which recent udev will no longer handle.

Quoted 5 lines

I got a similar request from Harald (CC'ed), but instead to create the nodes ourselves.

The way you did fits better with the current purpose of the static-nodes, but I'm ok with creating the nodes ourselves, too.

For what it is worth, the reason I didn't originally create the nodes in kmod was that I didn't want to redo mkdir_label_parents() and label_context_set() in kmod. If you don't use SELinux I guess this doesn't matter though.

Harald: why not put systemd-tmpfiles in dracut?

Cheers,

Tom

#3 lore raw
In reply to Dave Reisner
Quoted 8 lines · Dave Reisner

This adds an additional format to kmod static-nodes, which writes output as shell commands, e.g.:

mknod '/dev/btrfs-control' c 10 234
mknod '/dev/loop-control' c 10 237
mkdir -m 755 -p '/dev/net'
mknod '/dev/net/tun' c 10 200

Quoted 4 lines

Consumers of this format can simply pipe the output to a shell, creating the necessary static nodes. This could be useful for an initramfs which doesn't have systemd-tmpfiles but which still relies on static node creation which recent udev will no longer handle.

Seems reasonable enough, so if it is useful no objections from me.

However, two questions: why not simply ship systemd-tmpfiles in the initramfs to do this (which would also do things like selinux labels for those who care about that). Alternatively, why not just parse one of the existing formats in your shell script?

-t

Quoted 57 lines
 tools/static-nodes.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
tools/static-nodes.c +24 -1
index 0195390..2d68537 100644
@@ -43,11 +43,13 @@ struct static_nodes_format {
 static const struct static_nodes_format static_nodes_format_human;
 static const struct static_nodes_format static_nodes_format_tmpfiles;
 static const struct static_nodes_format static_nodes_format_devname;
+static const struct static_nodes_format static_nodes_format_shell;
 
 static const struct static_nodes_format *static_nodes_formats[] = {
        &static_nodes_format_human,
        &static_nodes_format_tmpfiles,
        &static_nodes_format_devname,
+       &static_nodes_format_shell,
 };
 
 static const char cmdopts_s[] = "o:f:h";
@@ -126,6 +128,28 @@ static const struct static_nodes_format static_nodes_format_devname = {
        .description = "the modules.devname format.",
 };
 
+static int write_shell(FILE *out, char modname[], char devname[], char type, unsigned int maj, unsigned int min)
+{
+       const char *dir = strrchr(devname, '/');
+
+       if (dir) {
+               if (fprintf(out, "mkdir -m 755 -p '/dev/%.*s'\n",
+                                       (int)(dir - devname), devname) < 0)
+                       return EXIT_FAILURE;
+       }
+
+       if (fprintf(out, "mknod '/dev/%s' %c %u %u\n", devname, type, maj, min) < 0)
+               return EXIT_FAILURE;
+
+       return EXIT_SUCCESS;
+}
+
+static const struct static_nodes_format static_nodes_format_shell = {
+       .name = "shell",
+       .write = write_shell,
+       .description = "mknod commands for consumption by a shell.",
+};
+
 static void help(void)
 {
        size_t i;
--

1.8.4

--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#4 lore raw
Quoted 14 lines · Tom Gundersen
Quoted 8 lines · Dave Reisner

This adds an additional format to kmod static-nodes, which writes output as shell commands, e.g.:

mknod '/dev/btrfs-control' c 10 234
mknod '/dev/loop-control' c 10 237
mkdir -m 755 -p '/dev/net'
mknod '/dev/net/tun' c 10 200

Quoted 4 lines

Consumers of this format can simply pipe the output to a shell, creating the necessary static nodes. This could be useful for an initramfs which doesn't have systemd-tmpfiles but which still relies on static node creation which recent udev will no longer handle.

Quoted 6 lines

Seems reasonable enough, so if it is useful no objections from me.

However, two questions: why not simply ship systemd-tmpfiles in the initramfs to do this (which would also do things like selinux labels for those who care about that). Alternatively, why not just parse one of the existing formats in your shell script?

I started writing the code to parse the raw devname format in shell, and decided it would be easier to borrow the already existing parser in the static nodes tool. Other people might get use out of it too if they don't want to deal with systemd-tmpfiles.

Quoted 59 lines

-t

Quoted 57 lines
 tools/static-nodes.c | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)
tools/static-nodes.c +24 -1
index 0195390..2d68537 100644
@@ -43,11 +43,13 @@ struct static_nodes_format {
 static const struct static_nodes_format static_nodes_format_human;
 static const struct static_nodes_format static_nodes_format_tmpfiles;
 static const struct static_nodes_format static_nodes_format_devname;
+static const struct static_nodes_format static_nodes_format_shell;
 
 static const struct static_nodes_format *static_nodes_formats[] = {
        &static_nodes_format_human,
        &static_nodes_format_tmpfiles,
        &static_nodes_format_devname,
+       &static_nodes_format_shell,
 };
 
 static const char cmdopts_s[] = "o:f:h";
@@ -126,6 +128,28 @@ static const struct static_nodes_format static_nodes_format_devname = {
        .description = "the modules.devname format.",
 };
 
+static int write_shell(FILE *out, char modname[], char devname[], char type, unsigned int maj, unsigned int min)
+{
+       const char *dir = strrchr(devname, '/');
+
+       if (dir) {
+               if (fprintf(out, "mkdir -m 755 -p '/dev/%.*s'\n",
+                                       (int)(dir - devname), devname) < 0)
+                       return EXIT_FAILURE;
+       }
+
+       if (fprintf(out, "mknod '/dev/%s' %c %u %u\n", devname, type, maj, min) < 0)
+               return EXIT_FAILURE;
+
+       return EXIT_SUCCESS;
+}
+
+static const struct static_nodes_format static_nodes_format_shell = {
+       .name = "shell",
+       .write = write_shell,
+       .description = "mknod commands for consumption by a shell.",
+};
+
 static void help(void)
 {
        size_t i;
--

1.8.4

--
To unsubscribe from this list: send the line "unsubscribe linux-modules" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html