Use explicit plugin names to prevent subtle macro processing bugs

This commit is contained in:
bazub committed 2026-03-06 20:36:23 +00:00
1 parent 4ce810cc1f
commit 662293e194
16 files changed
+25 -24

No files matched your search

+3 -3
View File
@@ -38,7 +38,7 @@
static void save(void *arg) static void save(void *arg)
{ {
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "alsa-utils");
return; return;
} }
@@ -51,7 +51,7 @@ static void save(void *arg)
static void restore(void *arg) static void restore(void *arg)
{ {
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "alsa-utils");
return; return;
} }
@@ -62,7 +62,7 @@ static void restore(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "alsa-utils",
.hook[HOOK_BASEFS_UP] = { .cb = restore }, .hook[HOOK_BASEFS_UP] = { .cb = restore },
.hook[HOOK_SHUTDOWN] = { .cb = save } .hook[HOOK_SHUTDOWN] = { .cb = save }
}; };
+1 -1
View File
@@ -172,7 +172,7 @@ static void setup(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "bootmisc",
.hook[HOOK_MOUNT_POST] = { .cb = clean }, .hook[HOOK_MOUNT_POST] = { .cb = clean },
.hook[HOOK_BASEFS_UP] = { .cb = setup }, .hook[HOOK_BASEFS_UP] = { .cb = setup },
.depends = { "pidfile" }, .depends = { "pidfile" },
+2 -2
View File
@@ -106,7 +106,7 @@ static void setup(void *arg)
char *cmd; char *cmd;
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "dbus");
return; return;
} }
@@ -164,7 +164,7 @@ static void setup(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "dbus",
.hook[HOOK_SVC_PLUGIN] = { .cb = setup }, .hook[HOOK_SVC_PLUGIN] = { .cb = setup },
}; };
+1 -1
View File
@@ -79,7 +79,7 @@ static void hscript_shutdown(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "hook-scripts",
.hook[HOOK_BANNER] = { .cb = hscript_banner }, .hook[HOOK_BANNER] = { .cb = hscript_banner },
.hook[HOOK_ROOTFS_UP] = { .cb = hscript_rootfs_up }, .hook[HOOK_ROOTFS_UP] = { .cb = hscript_rootfs_up },
.hook[HOOK_MOUNT_ERROR] = { .cb = hscript_mount_error }, .hook[HOOK_MOUNT_ERROR] = { .cb = hscript_mount_error },
+1 -1
View File
@@ -228,7 +228,7 @@ static void coldplug(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "modprobe",
.hook[HOOK_BASEFS_UP] = { .cb = coldplug }, .hook[HOOK_BASEFS_UP] = { .cb = coldplug },
.depends = { "bootmisc", } .depends = { "bootmisc", }
}; };
+1 -1
View File
@@ -213,7 +213,7 @@ static void load(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "modules-load",
.hook[HOOK_SVC_PLUGIN] = { .cb = load }, .hook[HOOK_SVC_PLUGIN] = { .cb = load },
}; };
+1 -1
View File
@@ -426,7 +426,7 @@ static void nl_enumerate(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "netlink",
.hook[HOOK_SVC_RECONF] = { .cb = nl_reconf }, .hook[HOOK_SVC_RECONF] = { .cb = nl_reconf },
.hook[HOOK_SVC_PLUGIN] = { .cb = nl_enumerate }, .hook[HOOK_SVC_PLUGIN] = { .cb = nl_enumerate },
.io = { .io = {
+1 -1
View File
@@ -335,7 +335,7 @@ static void pidfile_init(void *arg)
* SIGSTP:ed (in state PAUSED) waiting for <net/iface/lo>. * SIGSTP:ed (in state PAUSED) waiting for <net/iface/lo>.
*/ */
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "pidfile",
.hook[HOOK_BASEFS_UP] = { .cb = pidfile_init }, .hook[HOOK_BASEFS_UP] = { .cb = pidfile_init },
.hook[HOOK_SVC_RECONF] = { .cb = pidfile_reconf }, .hook[HOOK_SVC_RECONF] = { .cb = pidfile_reconf },
.depends = { "netlink" }, /* bootmisc depends on us */ .depends = { "netlink" }, /* bootmisc depends on us */
+2 -2
View File
@@ -43,7 +43,7 @@ static void setup(void *arg)
glob_t gl; glob_t gl;
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "procps");
return; return;
} }
@@ -69,7 +69,7 @@ static void setup(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "procps",
.hook[HOOK_BASEFS_UP] = { .hook[HOOK_BASEFS_UP] = {
.cb = setup .cb = setup
}, },
+1 -1
View File
@@ -51,7 +51,7 @@ static void setup(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "resolvconf",
.hook[HOOK_BASEFS_UP] = { .hook[HOOK_BASEFS_UP] = {
.cb = setup .cb = setup
}, },
+3 -3
View File
@@ -236,7 +236,7 @@ static void rtc_save(void *arg)
int fd, rc = 0; int fd, rc = 0;
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "rtc");
return; return;
} }
@@ -266,7 +266,7 @@ static void rtc_restore(void *arg)
int fd, rc = 0; int fd, rc = 0;
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "rtc");
return; return;
} }
@@ -321,7 +321,7 @@ static void update(uev_t *w, void *arg, int events)
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "rtc",
.hook[HOOK_BASEFS_UP] = { .hook[HOOK_BASEFS_UP] = {
.cb = rtc_restore .cb = rtc_restore
}, },
+1 -1
View File
@@ -180,7 +180,7 @@ static void sys_init(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "sys",
.hook[HOOK_BASEFS_UP] = { .cb = sys_init }, .hook[HOOK_BASEFS_UP] = { .cb = sys_init },
.depends = { "bootmisc", }, .depends = { "bootmisc", },
}; };
+1
View File
@@ -43,6 +43,7 @@
static void tty_watcher(void *arg, int fd, int events); static void tty_watcher(void *arg, int fd, int events);
static plugin_t plugin = { static plugin_t plugin = {
.name = "tty",
.io = { .io = {
.cb = tty_watcher, .cb = tty_watcher,
.flags = PLUGIN_IO_READ, .flags = PLUGIN_IO_READ,
+3 -3
View File
@@ -87,7 +87,7 @@ static void setup(void *arg)
int fd, err; int fd, err;
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "urandom");
return; return;
} }
@@ -188,7 +188,7 @@ static void save(void *arg)
mode_t prev; mode_t prev;
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "urandom");
return; return;
} }
@@ -202,7 +202,7 @@ static void save(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "urandom",
.hook[HOOK_BASEFS_UP] = { .cb = setup }, .hook[HOOK_BASEFS_UP] = { .cb = setup },
.hook[HOOK_SHUTDOWN] = { .cb = save }, .hook[HOOK_SHUTDOWN] = { .cb = save },
.depends = { "bootmisc", } .depends = { "bootmisc", }
+1 -1
View File
@@ -104,7 +104,7 @@ static void usr_init(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "usr",
.hook[HOOK_BASEFS_UP] = { .cb = usr_init }, .hook[HOOK_BASEFS_UP] = { .cb = usr_init },
.depends = { "bootmisc", }, .depends = { "bootmisc", },
}; };
+2 -2
View File
@@ -39,7 +39,7 @@
static void setup(void *arg) static void setup(void *arg)
{ {
if (rescue) { if (rescue) {
dbg("Skipping %s plugin in rescue mode.", __FILE__); dbg("Skipping %s plugin in rescue mode.", "x11-common");
return; return;
} }
@@ -48,7 +48,7 @@ static void setup(void *arg)
} }
static plugin_t plugin = { static plugin_t plugin = {
.name = __FILE__, .name = "x11-common",
.hook[HOOK_SVC_PLUGIN] = { .cb = setup }, .hook[HOOK_SVC_PLUGIN] = { .cb = setup },
}; };