Merge 4.16

Change-Id: I11db70a8e25a6656c5ec640a703e7b06d5a3672e

util/liveiso/build.sh

@@ -0,0 +1,14 @@
+#!/usr/bin/env sh
+
+config=$1
+
+if [ -z "$config" ] || [ ! -f "$config" ]; then
+	echo "Usage: $0 <config.nix>"
+	echo "No config given. Exiting."
+	exit 1
+fi
+
+nix-build '<nixpkgs/nixos>' \
+	-A config.system.build.isoImage \
+	-I nixos-config=$config \
+	-I nixpkgs=https://github.com/NixOS/nixpkgs/archive/refs/heads/nixos-21.11.tar.gz