Merge pull request #141487 from helsinki-systems/feat/nixos-install-variable

nixos/nixos-enter: Add IN_NIXOS_ENTER variable
This commit is contained in:
ajs124 2021-10-21 02:07:41 +02:00 committed by GitHub
commit c57f96274f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -68,7 +68,7 @@ mount --rbind /sys "$mountPoint/sys"
fi
# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings.
LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" chroot "$mountPoint" "$system/activate" 1>&2 || true
LOCALE_ARCHIVE="$system/sw/lib/locale/locale-archive" IN_NIXOS_ENTER=1 chroot "$mountPoint" "$system/activate" 1>&2 || true
# Create /tmp
chroot "$mountPoint" systemd-tmpfiles --create --remove --exclude-prefix=/dev 1>&2 || true