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.
This commit is contained in:
parent
59e3726755
commit
a8f50f9919
1 changed files with 1 additions and 19 deletions
|
@ -234,6 +234,7 @@ in
|
||||||
|
|
||||||
system.activationScripts.stdio = ""; # obsolete
|
system.activationScripts.stdio = ""; # obsolete
|
||||||
system.activationScripts.var = ""; # obsolete
|
system.activationScripts.var = ""; # obsolete
|
||||||
|
system.activationScripts.specialfs = ""; # obsolete
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"D /var/empty 0555 root root -"
|
"D /var/empty 0555 root root -"
|
||||||
|
@ -252,25 +253,6 @@ in
|
||||||
rmdir --ignore-fail-on-non-empty /usr/bin /usr
|
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 = {
|
systemd.user = {
|
||||||
services.nixos-activation = {
|
services.nixos-activation = {
|
||||||
description = "Run user-specific NixOS activation";
|
description = "Run user-specific NixOS activation";
|
||||||
|
|
Loading…
Reference in a new issue