wip: address feedback

Author: aanderse

plugins/plymouth.c

@@ -1,6 +1,6 @@
 /* Plymouth boot splash plugin for Finit
  *
- * Copyright (c) 2012-2026  Joachim Wiberg <troglobit@gmail.com>
+ * Copyright (c) 2012-2026  Aaron Andersen <troglobit@gmail.com>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to deal
@@ -37,19 +37,15 @@
  *                      splash during poweroff/reboot.
  *
  * The plugin is only activated when "splash" is present on the kernel
- * command line.  Plymouth requires devpts for VT takeover, which may
- * not be mounted yet at HOOK_BANNER time (before fs_finalize), so the
- * plugin mounts it if needed.
+ * command line.  Plymouth requires devpts for VT takeover; fs_init()
+ * mounts it early enough for HOOK_BANNER.
  *
  * NOTE: The initramfs must include /etc/initrd-release.  Plymouth
  * checks for this file and, when present, prefixes its argv[0] with
  * '@' so that the process is not killed during switch_root.  Without
  * it, plymouthd will not survive the initramfs-to-rootfs transition.
  */
 
-#include <sys/mount.h>
-#include <sys/stat.h>
-
 #include "config.h"
 #include "finit.h"
 #include "helpers.h"
@@ -99,13 +95,7 @@ static int plymouth_alive(void)
 	return daemon_pid > 0 && pid_alive(daemon_pid);
 }
 
-/*
- * Start plymouthd in the given mode ("boot" or "shutdown").
- *
- * Mounts devpts if needed -- HOOK_BANNER fires before fs_finalize(),
- * so /dev/pts may not exist yet.  Plymouth needs it for --attach-to-session
- * which gives it control of the VT for rendering.
- */
+/* Start plymouthd in the given mode ("boot" or "shutdown"). */
 static void plymouth_start(const char *mode)
 {
 	char cmd[256];
@@ -114,13 +104,6 @@ static void plymouth_start(const char *mode)
 	if (plymouth_alive())
 		return;
 
-	/* Mount devpts if not already mounted (needed for --attach-to-session) */
-	if (!fismnt("/dev/pts")) {
-		mkdir("/dev/pts", 0755);
-		mount("devpts", "/dev/pts", "devpts",
-		      MS_NOSUID | MS_NOEXEC, "ptmxmode=0666,mode=0620");
-	}
-
 	snprintf(cmd, sizeof(cmd),
 		 PLYMOUTHD_PATH " --attach-to-session --mode %s --pid-file %s",
 		 mode, PLYMOUTH_PIDFILE);

src/finit.c

@@ -370,8 +370,8 @@ static void fs_finalize(void)
 		fs_mount("shm", "/dev/shm", "tmpfs", flags | MS_NODEV, "mode=1777");
 	}
 
-	/* Modern systems use /dev/pts */
-	if (!fismnt("/dev/pts")) {
+	/* Remount devpts with proper gid/mode now that /etc/group is available */
+	{
 		char opts[32];
 		int gid;
 
@@ -383,7 +383,8 @@ static void fs_finalize(void)
 		snprintf(opts, sizeof(opts), "gid=%d,mode=0620,ptmxmode=0666", gid);
 
 		makedir("/dev/pts", 0755);
-		fs_mount("devpts", "/dev/pts", "devpts", flags, opts);
+		fs_mount("devpts", "/dev/pts", "devpts",
+			 flags | MS_REMOUNT, opts);
 	}
 
 	/* Needed on systems like Alpine Linux */
@@ -529,6 +530,13 @@ static void fs_init(void)
 
 		fs_mount(fs[i].spec, fs[i].file, fs[i].type, 0, NULL);
 	}
+
+	/* Early devpts mount for plugins that need PTY access (e.g. plymouth) */
+	if (!fismnt("/dev/pts")) {
+		makedir("/dev/pts", 0755);
+		fs_mount("devpts", "/dev/pts", "devpts",
+			 MS_NOSUID | MS_NOEXEC, "ptmxmode=0666");
+	}
 }