Merge pull request #149153 from helsinki-systems/systemd-upd-and-misc (c6f07eae) · Commits · nix / nixpkgs

nixos/modules/system/boot/systemd-lib.nix

+1 −3

Original line number	Diff line number	Diff line
		@@ -228,9 +228,7 @@ in rec {
		mkdir -p $out/getty.target.wants/
		ln -s ../autovt@tty1.service $out/getty.target.wants/

		ln -s ../local-fs.target ../remote-fs.target \
		../nss-lookup.target ../nss-user-lookup.target ../swap.target \
		$out/multi-user.target.wants/
		ln -s ../remote-fs.target $out/multi-user.target.wants/
		''}
		''; # */

+3 −3

Original line number	Diff line number	Diff line
		From d4ea219a35a09fe02bc9e47e8530644cb4fc4146 Mon Sep 17 00:00:00 2001
		From 93b2d29de784c68d1b4d70d7f214b19432aec6a8 Mon Sep 17 00:00:00 2001
		From: Eelco Dolstra <eelco.dolstra@logicblox.com>
		Date: Tue, 8 Jan 2013 15:46:30 +0100
		Subject: [PATCH 01/21] Start device units for uninitialised encrypted devices
		Subject: [PATCH 01/19] Start device units for uninitialised encrypted devices

		This is necessary because the NixOS service that initialises the
		filesystem depends on the appearance of the device unit. Also, this
		@@ -28,5 +28,5 @@ index 25b8a590a6..d18999ea87 100644
		SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
		SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
		--
		2.33.0
		2.33.1

+5 −5

Original line number	Diff line number	Diff line
		From 67abd8f22f70d9348bc9d8e0e93dde4d325627ba Mon Sep 17 00:00:00 2001
		From 41edb381df0326e216b3c569d2cd5764591267d9 Mon Sep 17 00:00:00 2001
		From: Eelco Dolstra <eelco.dolstra@logicblox.com>
		Date: Fri, 12 Apr 2013 13:16:57 +0200
		Subject: [PATCH 02/21] Don't try to unmount /nix or /nix/store
		Subject: [PATCH 02/19] Don't try to unmount /nix or /nix/store

		They'll still be remounted read-only.

		@@ -25,10 +25,10 @@ index f683f05981..5a04c2c2a6 100644
		"/etc"))
		return true;
		diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
		index c2a26242c0..9936398f32 100644
		index 1f945b7875..6df9d383ba 100644
		--- a/src/shutdown/umount.c
		+++ b/src/shutdown/umount.c
		@@ -496,6 +496,8 @@ static int delete_md(MountPoint *m) {
		@@ -508,6 +508,8 @@ static int delete_md(MountPoint *m) {

		static bool nonunmountable_path(const char *path) {
		return path_equal(path, "/")
		@@ -38,5 +38,5 @@ index c2a26242c0..9936398f32 100644
		\|\| path_equal(path, "/usr")
		#endif
		--
		2.33.0
		2.33.1

+3 −3

Original line number	Diff line number	Diff line
		From 37c9471f59bd57223014a4a645b5f96a71d78787 Mon Sep 17 00:00:00 2001
		From 43620479f6bfbbc4c3eed28947e0676c817acb7c Mon Sep 17 00:00:00 2001
		From: Eelco Dolstra <eelco.dolstra@logicblox.com>
		Date: Wed, 16 Apr 2014 10:59:28 +0200
		Subject: [PATCH 03/21] Fix NixOS containers
		Subject: [PATCH 03/19] Fix NixOS containers

		In NixOS containers, the init script is bind-mounted into the
		container, so checking early whether it exists will fail.
		@@ -30,5 +30,5 @@ index 575b9da447..438ca294db 100644

		} else {
		--
		2.33.0
		2.33.1

+3 −3

Original line number	Diff line number	Diff line
		From 987d6f94dac8e1a75615fd9ddcfb0eb1c2c4c349 Mon Sep 17 00:00:00 2001
		From a08ed6697974d7f7dabe60d42bbc9e31a10f7e23 Mon Sep 17 00:00:00 2001
		From: Eelco Dolstra <eelco.dolstra@logicblox.com>
		Date: Thu, 1 May 2014 14:10:10 +0200
		Subject: [PATCH 04/21] Look for fsck in the right place
		Subject: [PATCH 04/19] Look for fsck in the right place

		---
		src/fsck/fsck.c \| 2 +-
		@@ -21,5 +21,5 @@ index cd7adfaeb9..68cebdd158 100644
		cmdline[i++] = "-T";

		--
		2.33.0
		2.33.1