From a8f50f991948b91d1a191d1348bfff860a39b5a2 Mon Sep 17 00:00:00 2001 From: nikstur Date: Tue, 17 Oct 2023 17:41:29 +0200 Subject: [PATCH] nixos/activation: remove specialfs activationScript The stage-2-init.sh script has the same functionality hardcoded so we do not need it in the activationScript again. --- .../system/activation/activation-script.nix | 20 +------------------ 1 file changed, 1 insertion(+), 19 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index c62e3933405d..424a9d179998 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -234,6 +234,7 @@ in system.activationScripts.stdio = ""; # obsolete system.activationScripts.var = ""; # obsolete + system.activationScripts.specialfs = ""; # obsolete systemd.tmpfiles.rules = [ "D /var/empty 0555 root root -" @@ -252,25 +253,6 @@ in rmdir --ignore-fail-on-non-empty /usr/bin /usr ''; - system.activationScripts.specialfs = - '' - specialMount() { - local device="$1" - local mountPoint="$2" - local options="$3" - local fsType="$4" - - if mountpoint -q "$mountPoint"; then - local options="remount,$options" - else - mkdir -p "$mountPoint" - chmod 0755 "$mountPoint" - fi - mount -t "$fsType" -o "$options" "$device" "$mountPoint" - } - source ${config.system.build.earlyMountScript} - ''; - systemd.user = { services.nixos-activation = { description = "Run user-specific NixOS activation";