diff --git a/rootfs/mkrootfs.sh b/rootfs/mkrootfs.sh index 5fba8c5..ff19902 100644 --- a/rootfs/mkrootfs.sh +++ b/rootfs/mkrootfs.sh @@ -1,6 +1,6 @@ set -ex -o pipefail -mkdir -p $out +### create directory structure mkdir -p $out/etc/repart.d $out/dev $out/proc $out/sys $out/tmp $out/root $out/run $out/boot $out/mnt $out/home $out/srv $out/var/tmp ln -sf /usr/bin $out/bin ln -sf /usr/bin $out/sbin @@ -15,7 +15,8 @@ find $out -type d -exec chmod 755 {} \; rm -rf $out/usr/include rm -rf $out/usr/sbin rm -f $out/usr/lib/systemd/system/sysinit.target.wants/systemd-firstboot.service -# remove vconsole setup +rm -f $out/usr/lib/systemd/ukify +rm -f $out/usr/bin/ukify rm -f $out/usr/lib/udev/rules.d/90-vconsole.rules cat < $out/etc/os-release diff --git a/systemd/default.nix b/systemd/default.nix index 130cf42..6f5c6c9 100644 --- a/systemd/default.nix +++ b/systemd/default.nix @@ -184,6 +184,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonOption "tty-gid" "3") # tty in NixOS has gid 3 (lib.mesonOption "kmod-path" "/usr/bin/kmod") + (lib.mesonOption "kexec-path" "/usr/bin/kexec") (lib.mesonOption "debug-shell" "/usr/bin/sh") (lib.mesonOption "pamconfdir" "/etc/pam.d") (lib.mesonOption "shellprofiledir" "/etc/profile.d")