internal/kobject: pass action kind for range

Useful for handling most uevents.

Signed-off-by: Ophestra <cat@gensokyo.uk>

cmd/earlyinit/main.go

@@ -19,6 +19,7 @@ import (
 	"hakurei.app/internal/kobject"
 	"hakurei.app/internal/report"
 	"hakurei.app/internal/uevent"
+	"hakurei.app/message"
 )
 
 var r report.Reporter
@@ -79,6 +80,8 @@ const (
 	// optionSystem specifies devpath of the system device.
 	optionSystem = "system"
 
+	// flagVerbose increases output verbosity.
+	flagVerbose = "verbose"
 	// flagStrict sets [report.DStrict] on r.
 	flagStrict = "strict"
 	// flagNoRecover sets [report.DNoRecover] on r.
@@ -116,6 +119,9 @@ func main() {
 		r.SetFlags(flag)
 	}
 
+	msg := message.New(log.Default())
+	msg.SwapVerbose(slices.Contains(flags, flagVerbose))
+
 	mustSyscall("mount devtmpfs", Mount(
 		"devtmpfs",
 		"/dev/",
@@ -193,7 +199,7 @@ func main() {
 	must1(rand.Read(uuid[:]))
 	ctx, cancel := context.WithCancel(context.Background())
 
-	go consume(ctx, &r, conn, uuid, events)
+	go consume(ctx, msg, &r, conn, uuid, events)
 	s := kobject.New(uuid, func(o *kobject.Object, env map[string]string) {
 		log.Printf("change %s: %q", o.DevPath, env)
 	}, func(err error) {

cmd/earlyinit/mount.go

@@ -12,6 +12,7 @@ import (
 	"hakurei.app/check"
 	"hakurei.app/fhs"
 	"hakurei.app/internal/kobject"
+	"hakurei.app/internal/uevent"
 )
 
 // mustMountSystem waits for and mounts a system device matching pattern.
@@ -26,8 +27,9 @@ func mustMountSystem(
 	for {
 		var matchErr error
 		var systemPath *check.Absolute
-		s.Range(c, func(o *kobject.Object) bool {
-			if o.Subsystem != "block" ||
+		s.Range(c, func(o *kobject.Object, act uevent.KobjectAction) bool {
+			if (act != uevent.KOBJ_ADD && act != uevent.KOBJ_CHANGE) ||
+				o.Subsystem != "block" ||
 				o.Env["DEVTYPE"] != "disk" {
 				return true
 			}

cmd/earlyinit/uevent.go

@@ -2,12 +2,12 @@ package main
 
 import (
 	"context"
-	"log"
 	"time"
 
 	"hakurei.app/fhs"
 	"hakurei.app/internal/report"
 	"hakurei.app/internal/uevent"
+	"hakurei.app/message"
 )
 
 // newRejectColdboot returns a function to be called on every subsequent pending
@@ -56,6 +56,7 @@ func newRejectColdboot() func() bool {
 // consume continuously consumes events from conn with retries.
 func consume(
 	ctx context.Context,
+	msg message.Msg,
 	r *report.Reporter,
 	conn *uevent.Conn,
 	uuid uevent.UUID,
@@ -67,7 +68,7 @@ func consume(
 	coldboot := true
 retry:
 	if dispatchErr := conn.Consume(ctx, fhs.Sys, &uuid, events, coldboot, func(path string) {
-		log.Println("coldboot visited", path)
+		msg.Verbose("coldboot visited", path)
 	}, func(err error) bool {
 		if _, ok := err.(uevent.NeedsColdboot); ok && !nextColdboot() {
 			r.Dispatch(