Merge pull request #165935 from helsinki-systems/feat/move-special-fs-options-into-module (f5054121) · Commits · nix / nixpkgs

nixos/modules/system/boot/stage-2.nix

+0 −30

Original line number	Diff line number	Diff line
		@@ -47,36 +47,6 @@ in
		'';
		};

		devSize = mkOption {
		default = "5%";
		example = "32m";
		type = types.str;
		description = ''
		Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
		for the accepted syntax.
		'';
		};

		devShmSize = mkOption {
		default = "50%";
		example = "256m";
		type = types.str;
		description = ''
		Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
		for the accepted syntax.
		'';
		};

		runSize = mkOption {
		default = "25%";
		example = "256m";
		type = types.str;
		description = ''
		Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
		for the accepted syntax.
		'';
		};

		systemdExecutable = mkOption {
		default = "systemd";
		type = types.str;

+29 −0

Original line number	Diff line number	Diff line
		@@ -215,6 +215,35 @@ in
		'';
		};

		boot.devSize = mkOption {
		default = "5%";
		example = "32m";
		type = types.str;
		description = ''
		Size limit for the /dev tmpfs. Look at mount(8), tmpfs size option,
		for the accepted syntax.
		'';
		};

		boot.devShmSize = mkOption {
		default = "50%";
		example = "256m";
		type = types.str;
		description = ''
		Size limit for the /dev/shm tmpfs. Look at mount(8), tmpfs size option,
		for the accepted syntax.
		'';
		};

		boot.runSize = mkOption {
		default = "25%";
		example = "256m";
		type = types.str;
		description = ''
		Size limit for the /run tmpfs. Look at mount(8), tmpfs size option,
		for the accepted syntax.
		'';
		};
		};