init: Convert all service definitions to toml

Cargo.lock

@@ -1133,6 +1133,7 @@ dependencies = [
  "libredox",
  "serde",
  "serde_json",
+ "toml",
 ]
 
 [[package]]

init.d/00_logging_ramfs.service

@@ -1,13 +1,8 @@
-{
-    "unit": {
-        "default_dependencies": false,
-        "requires_weak": ["00_randd.service"]
-    },
-    "service": {
-        "cmd": "ramfs",
-        "args": ["logging"],
-        "type": {
-            "scheme": "logging"
-        }
-    }
-}
+[unit]
+default_dependencies = false
+requires_weak = ["00_randd.service"]
+
+[service]
+cmd = "ramfs"
+args = ["logging"]
+type = { scheme = "logging" }

init.d/00_nulld.service

@@ -1,12 +1,7 @@
-{
-    "unit": {
-        "description": "/dev/null",
-        "default_dependencies": false
-    },
-    "service": {
-        "cmd": "nulld",
-        "type": {
-            "scheme": "null"
-        }
-    }
-}
+[unit]
+description = "/dev/null"
+default_dependencies = false
+
+[service]
+cmd = "nulld"
+type = { scheme = "null" }

init.d/00_randd.service

@@ -1,15 +1,8 @@
-{
-    "unit": {
-        "description": "/dev/rand",
-        "default_dependencies": false
-    },
-    "service": {
-        "cmd": "randd",
-        "args": [
-            "rand"
-        ],
-        "type": {
-            "scheme": "rand"
-        }
-    }
-}
+[unit]
+description = "/dev/random"
+default_dependencies = false
+
+[service]
+cmd = "randd"
+args = ["rand"]
+type = { scheme = "rand" }

init.d/00_rtcd.service

@@ -1,10 +1,7 @@
-{
-    "unit": {
-        "description": "Set time from realtime clock",
-        "default_dependencies": false
-    },
-    "service": {
-        "cmd": "rtcd",
-        "type": "oneshot"
-    }
-}
+[unit]
+description = "Set time from realtime clock"
+default_dependencies = false
+
+[service]
+cmd = "rtcd"
+type = "oneshot"

init.d/00_runtime.target

@@ -1,13 +1,10 @@
-{
-    "unit": {
-        "description": "Services that relibc needs to function",
-        "default_dependencies": false,
-        "requires_weak": [
-            "00_nulld.service",
-            "00_randd.service",
-            "00_rtcd.service",
-            "00_zerod.service",
-            "00_logging_ramfs.service"
-        ]
-    }
-}
+[unit]
+description = "Services that relibc needs to function"
+default_dependencies = false
+requires_weak = [
+    "00_nulld.service",
+    "00_randd.service",
+    "00_rtcd.service",
+    "00_zerod.service",
+    "00_logging_ramfs.service",
+]

init.d/00_zerod.service

@@ -1,12 +1,7 @@
-{
-    "unit": {
-        "description": "/dev/zero",
-        "default_dependencies": false
-    },
-    "service": {
-        "cmd": "zerod",
-        "type": {
-            "scheme": "zero"
-        }
-    }
-}
+[unit]
+description = "/dev/zero"
+default_dependencies = false
+
+[service]
+cmd = "zerod"
+type = { scheme = "zero" }

init.d/10_inputd.service

@@ -1,11 +1,6 @@
-{
-    "unit": {
-        "description": "VT input and graphics multiplexer"
-    },
-    "service": {
-        "cmd": "inputd",
-        "type": {
-            "scheme": "input"
-        }
-    }
-}
+[unit]
+description = "VT input and graphics multiplexer"
+
+[service]
+cmd = "inputd"
+type = { scheme = "input" }

init.d/10_lived.service

@@ -1,10 +1,7 @@
-{
-    "_comment": "Needs to start before drivers to ensure it gets priority when redoxfs searches for disks",
-    "unit": {
-        "description": "Live disk"
-    },
-    "service": {
-        "cmd": "lived",
-        "type": "notify"
-    }
-}
+# Needs to start before drivers to ensure it gets priority when redoxfs searches for disks
+[unit]
+description = "Live disk"
+
+[service]
+cmd = "lived"
+type = "notify"

init.d/20_fbbootlogd.service

@@ -1,12 +1,7 @@
-{
-    "unit": {
-        "description": "Graphical bootlog",
-        "requires_weak": ["10_inputd.service", "20_vesad.service"]
-    },
-    "service": {
-        "cmd": "fbbootlogd",
-        "type": {
-            "scheme": "fbbootlog"
-        }
-    }
-}
+[unit]
+description = "Graphical bootlog"
+requires_weak = ["10_inputd.service", "20_vesad.service"]
+
+[service]
+cmd = "fbbootlogd"
+type = { scheme = "fbbootlog" }

init.d/20_fbcond.service

@@ -1,13 +1,8 @@
-{
-    "unit": {
-        "description": "Framebuffer text console",
-        "requires_weak": ["10_inputd.service", "20_vesad.service"]
-    },
-    "service": {
-        "cmd": "fbcond",
-        "args": ["2"],
-        "type": {
-            "scheme": "fbcon"
-        }
-    }
-}
+[unit]
+description = "Framebuffer text console"
+requires_weak = ["10_inputd.service", "20_vesad.service"]
+
+[service]
+cmd = "fbcond"
+args = ["2"]
+type = { scheme = "fbcon" }

init.d/20_graphics.target

@@ -1,11 +1,8 @@
-{
-    "unit": {
-        "description": "Graphics subsystem",
-        "requires_weak": [
-            "10_inputd.service",
-            "20_vesad.service",
-            "20_fbbootlogd.service",
-            "20_fbcond.service"
-        ]
-    }
-}
+[unit]
+description = "Graphics subsystem"
+requires_weak = [
+    "10_inputd.service",
+    "20_vesad.service",
+    "20_fbbootlogd.service",
+    "20_fbcond.service",
+]

init.d/20_vesad.service

@@ -1,19 +1,14 @@
-{
-    "unit": {
-        "description": "Bootloader framebuffer handler",
-        "requires_weak": [
-            "10_inputd.service"
-        ]
-    },
-    "service": {
-        "cmd": "vesad",
-        "inherit_envs": [
-            "FRAMEBUFFER_ADDR",
-            "FRAMEBUFFER_VIRT",
-            "FRAMEBUFFER_WIDTH",
-            "FRAMEBUFFER_HEIGHT",
-            "FRAMEBUFFER_STRIDE"
-        ],
-        "type": "notify"
-    }
-}
+[unit]
+description = "Bootloader framebuffer handler"
+requires_weak = ["10_inputd.service"]
+
+[service]
+cmd = "vesad"
+inherit_envs = [
+    "FRAMEBUFFER_ADDR",
+    "FRAMEBUFFER_VIRT",
+    "FRAMEBUFFER_WIDTH",
+    "FRAMEBUFFER_HEIGHT",
+    "FRAMEBUFFER_STRIDE",
+]
+type = "notify"

init.d/90_exit_initfs.switchroot

@@ -1,9 +1,6 @@
-{
-    "unit": {
-        "requires_weak": ["50_rootfs"]
-    },
-    "switchroot": {
-        "prefix": "/usr",
-        "etcdir": "/etc"
-    }
-}
+[unit]
+requires_weak = ["50_rootfs"]
+
+[switchroot]
+prefix = "/usr"
+etcdir = "/etc"

init/Cargo.toml

@@ -8,6 +8,7 @@ license = "MIT"
 libredox.workspace = true
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
+toml = "1"
 
 config = { path = "../config" }
 daemon = { path = "../daemon" }

init/src/unit.rs

@@ -149,7 +149,8 @@ impl Unit {
                 )
             }
             Some("service") => {
-                let service: SerializedService = serde_json::from_str(&config)?;
+                let service: SerializedService = toml::from_str(&config)
+                    .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
                 (
                     service.unit,
                     UnitKind::Service {
@@ -159,11 +160,13 @@ impl Unit {
                 )
             }
             Some("target") => {
-                let target: SerializedTarget = serde_json::from_str(&config)?;
+                let target: SerializedTarget = toml::from_str(&config)
+                    .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
                 (target.unit, UnitKind::Target {}, vec![])
             }
             Some("switchroot") => {
-                let switchroot: SerializedSwitchRoot = serde_json::from_str(&config)?;
+                let switchroot: SerializedSwitchRoot = toml::from_str(&config)
+                    .map_err(|err| io::Error::new(io::ErrorKind::InvalidData, err))?;
                 (
                     switchroot.unit,
                     UnitKind::SwitchRoot {