@ -105,6 +105,9 @@ let
opts = options ++ optional autoFormat " x - s y s t e m d . m a k e f s " ++ optional autoResize " x - s y s t e m d . g r o w f s " ;
in " ${ device } / s y s r o o t ${ mountPoint } ${ fsType } ${ lib . concatStringsSep " , " opts } " ) fileSystems ) ;
needMakefs = lib . any ( fs : fs . autoFormat ) fileSystems ;
needGrowfs = lib . any ( fs : fs . autoResize ) fileSystems ;
kernel-name = config . boot . kernelPackages . kernel . name or " k e r n e l " ;
modulesTree = config . system . modulesTree . override { name = kernel-name + " - m o d u l e s " ; } ;
firmware = config . hardware . firmware ;
@ -360,18 +363,22 @@ in {
storePaths = [
# systemd tooling
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - f s c k "
"${ cfg . package } / l i b / s y s t e m d / s y s t e m d - g r o w f s "
( lib . mkIf needGrowfs "${ cfg . package } / l i b / s y s t e m d / s y s t e m d - g r o w f s " )
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - h i b e r n a t e - r e s u m e "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - j o u r n a l d "
"${ cfg . package } / l i b / s y s t e m d / s y s t e m d - m a k e f s "
( lib . mkIf needMakefs "${ cfg . package } / l i b / s y s t e m d / s y s t e m d - m a k e f s " )
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - m o d u l e s - l o a d "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - r e m o u n t - f s "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - s h u t d o w n "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - s u l o g i n - s h e l l "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m d - s y s c t l "
# additional systemd directories
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m - g e n e r a t o r s "
# generators
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m - g e n e r a t o r s / s y s t e m d - d e b u g - g e n e r a t o r "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m - g e n e r a t o r s / s y s t e m d - f s t a b - g e n e r a t o r "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m - g e n e r a t o r s / s y s t e m d - g p t - a u t o - g e n e r a t o r "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m - g e n e r a t o r s / s y s t e m d - h i b e r n a t e - r e s u m e - g e n e r a t o r "
" ${ cfg . package } / l i b / s y s t e m d / s y s t e m - g e n e r a t o r s / s y s t e m d - r u n - g e n e r a t o r "
# utilities needed by systemd
" ${ cfg . package . util-linux } / b i n / m o u n t "
@ -409,8 +416,8 @@ in {
mkdir - p $ out/etc/systemd/system
touch $ out/etc/systemd/system/systemd- { makefs , growfs } @ . service
'' ) ] ;
services . " s y s t e m d - m a k e f s @ " . unitConfig . IgnoreOnIsolate = true ;
services . " s y s t e m d - g r o w f s @ " . unitConfig . IgnoreOnIsolate = true ;
services . " s y s t e m d - m a k e f s @ " = lib . mkIf needMakefs { unitConfig . IgnoreOnIsolate = true ; } ;
services . " s y s t e m d - g r o w f s @ " = lib . mkIf needGrowfs { unitConfig . IgnoreOnIsolate = true ; } ;
services . initrd-nixos-activation = {
after = [ " i n i t r d - f s . t a r g e t " ] ;