Enable users thanks to userborn

crates/system-manager-engine/src/activate.rs

@@ -81,6 +81,8 @@ pub fn activate(store_path: &StorePath, ephemeral: bool) -> Result<()> {
 
     match etc_files::activate(store_path, old_state.file_tree, ephemeral) {
         Ok(etc_tree) => {
+            log::info!("Restarting sysinit-reactivation.target...");
+            services::restart_sysinit_reactivation_target()?;
             log::info!("Activating tmp files...");
             let tmp_result = tmp_files::activate(&etc_tree);
             if let Err(e) = &tmp_result {
@@ -106,6 +108,19 @@ pub fn activate(store_path: &StorePath, ephemeral: bool) -> Result<()> {
             };
             final_state.write_to_file(state_file)?;
 
+            log::info!("Running system activation script...");
+            match run_system_activation_script(store_path) {
+                Ok(status) if status.success() => {
+                    log::info!("System activation script executed successfully.");
+                }
+                Ok(status) => {
+                    log::error!("System activation script failed with status: {status}");
+                }
+                Err(e) => {
+                    log::error!("Error running system activation script: {e}");
+                }
+            }
+
             if let Err(e) = tmp_result {
                 return Err(e.into());
             }
@@ -218,6 +233,19 @@ fn run_preactivation_assertions(store_path: &StorePath) -> Result<process::ExitS
     Ok(status)
 }
 
+fn run_system_activation_script(store_path: &StorePath) -> Result<process::ExitStatus> {
+    let status = process::Command::new(
+        store_path
+            .store_path
+            .join("bin")
+            .join("systemActivationScript"),
+    )
+    .stderr(process::Stdio::inherit())
+    .stdout(process::Stdio::inherit())
+    .status()?;
+    Ok(status)
+}
+
 fn get_state_file() -> Result<PathBuf> {
     let state_file = Path::new(SYSTEM_MANAGER_STATE_DIR).join(STATE_FILE_NAME);
     DirBuilder::new()

crates/system-manager-engine/src/activate/services.rs

@@ -79,13 +79,6 @@ pub fn activate(
     )
     .map_err(|e| ActivationError::with_partial_result(services.clone(), e))?;
 
-    // We added all new services and removed old ones, so let's reload the units
-    // to tell systemd about them.
-    log::info!("Reloading the systemd daemon...");
-    service_manager
-        .daemon_reload()
-        .map_err(|e| ActivationError::with_partial_result(services.clone(), e))?;
-
     wait_for_jobs(
         &service_manager,
         &job_monitor,
@@ -308,3 +301,21 @@ impl From<JobId> for String {
         value.id
     }
 }
+
+pub fn restart_sysinit_reactivation_target() -> anyhow::Result<()> {
+    let service_manager = systemd::ServiceManager::new_session()?;
+    let job_monitor = service_manager.monitor_jobs_init()?;
+    let timeout = Some(Duration::from_secs(30));
+
+    log::info!("Reloading the systemd daemon...");
+    service_manager.daemon_reload()?;
+
+    let jobs = for_each_unit(
+        |unit| service_manager.restart_unit(unit),
+        ["sysinit-reactivation.target"],
+        "restarting",
+    );
+
+    wait_for_jobs(&service_manager, &job_monitor, jobs, &timeout)?;
+    Ok(())
+}

examples/example.nix

@@ -102,5 +102,9 @@
         mode = "0755";
       };
     };
+
+    system.activationScripts.test = ''
+      echo "This is a test activation script"
+    '';
   };
 }

flake.nix

@@ -7,9 +7,14 @@
   };
 
   inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+  inputs.userborn.url = "github:JulienMalka/userborn/stateful-users";
 
   outputs =
-    { self, nixpkgs }:
+    {
+      self,
+      nixpkgs,
+      userborn,
+    }:
     let
       systems = [
         "aarch64-linux"
@@ -26,8 +31,8 @@
         );
       nix-vm-test-lib =
         let
-          rev = "e34870b8dd2c2d203c05b4f931b8c33eaaf43b81";
-          sha256 = "sha256:1qp1fq96kv9i1nj20m25057pfcs1b1c9bj4502xy7gnw8caqr30d";
+          rev = "991369a72fe577c2bcdad0b26bf8c63a6f94f84b";
+          sha256 = "sha256:1ygn0acvzzrg0jbnbpwfl4n4k2ka6ay0x34sj61g11c1pvckl3m9";
         in
         "${
           builtins.fetchTarball {
@@ -82,6 +87,7 @@
               (import ./test/nix/modules {
                 inherit system;
                 inherit (nixpkgs) lib;
+                userborn = userborn.packages.${system}.default;
                 nix-vm-test = import nix-vm-test-lib {
                   inherit nixpkgs;
                   inherit system;

nix/modules/default.nix

@@ -81,23 +81,23 @@
 
       # Statically assigned UIDs and GIDs.
       # Ideally we use DynamicUser as much as possible to avoid the need for these.
-      ids = {
-        uids = lib.mkOption {
-          internal = true;
-          description = lib.mdDoc ''
-            The user IDs used by system-manager.
-          '';
-          type = types.attrsOf types.int;
-        };
-
-        gids = lib.mkOption {
-          internal = true;
-          description = lib.mdDoc ''
-            The group IDs used by system-manager.
-          '';
-          type = types.attrsOf types.int;
-        };
-      };
+      # ids = {
+      #   uids = lib.mkOption {
+      #     internal = true;
+      #     description = lib.mdDoc ''
+      #       The user IDs used by system-manager.
+      #     '';
+      #     type = types.attrsOf types.int;
+      #   };
+      #
+      #   gids = lib.mkOption {
+      #     internal = true;
+      #     description = lib.mdDoc ''
+      #       The group IDs used by system-manager.
+      #     '';
+      #     type = types.attrsOf types.int;
+      #   };
+      # };
 
       # No-op option for now.
       # TODO: should we include the settings in /etc/logrotate.d ?
@@ -108,12 +108,12 @@
       };
 
       # No-op option for now.
-      users = lib.mkOption {
-        internal = true;
-        default = { };
-        type = types.attrs;
-      };
-
+      # users = lib.mkOption {
+      #   internal = true;
+      #   default = { };
+      #   type = types.attrs;
+      # };
+      #
       networking = {
         enableIPv6 = lib.mkEnableOption "IPv6" // {
           default = true;
@@ -232,6 +232,8 @@
           ${system-manager}/bin/system-manager-engine deactivate "$@"
         '';
 
+        systemActivationScript = pkgs.writeShellScript "systemActivationScript" config.system.activationScripts.script;
+
         preActivationAssertionScript =
           let
             mkAssertion =
@@ -275,6 +277,7 @@
               exit 0
             fi
           '';
+
       };
 
       # TODO: handle globbing