AtaraxiaDev/nixos-config
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update autoinstall

Browse Source
This commit is contained in:
Dmitriy Kholkin 2023-01-26 00:34:37 +03:00
parent 97ae639a6a
commit 885096bf81
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
modules/autoinstall/autoinstall.sh
View File

@ -28,6 +28,7 @@ bootPoolReservation="${bootPoolReservation?}"
usePersistModule="${usePersistModule?}" usePersistModule="${usePersistModule?}"
persistRoot="${persistRoot?}" persistRoot="${persistRoot?}"
persistHome="${persistHome?}" persistHome="${persistHome?}"
oldUefi="${oldUefi?}"
if [ "$debug" = "true" ]; then if [ "$debug" = "true" ]; then
cat >&2 << FIN cat >&2 << FIN
@ -58,6 +59,7 @@ cat >&2 << FIN
usePersistModule="${usePersistModule}" usePersistModule="${usePersistModule}"
persistRoot="${persistRoot}" persistRoot="${persistRoot}"
persistHome="${persistHome}" persistHome="${persistHome}"
oldUefi="${oldUefi}"
FIN FIN
fi fi
@ -349,12 +351,6 @@ chown 1000:100 $flakesPath/machines/$hostname/hardware-configuration.nix
git config --global --add safe.directory "$flakesPath" git config --global --add safe.directory "$flakesPath"
git -C "$flakesPath" add -A git -C "$flakesPath" add -A
configPath="/mnt/home/"$mainUser"/nixos-config"
mkdir -p $configPath
chown -R 1000:100 /mnt/home/$mainUser
cp -aT $flakesPath $configPath
pprint "Gen ssh host key for initrd" pprint "Gen ssh host key for initrd"
ssh-keygen -t ed25519 -N "" -f /mnt/etc/secrets/ssh_host_key ssh-keygen -t ed25519 -N "" -f /mnt/etc/secrets/ssh_host_key
chown root:root /mnt/etc/secrets/ssh_host_key chown root:root /mnt/etc/secrets/ssh_host_key
@ -366,7 +362,20 @@ if [ "$useEncryption" = "true" ]; then
fi fi
if [ "$debug" != "true" ]; then if [ "$debug" != "true" ]; then
nixos-install --flake "$configPath/#$hostname" --root /mnt --no-root-passwd nixos-install --flake "$flakesPath/#$hostname" --root /mnt --no-root-passwd
configPath="/mnt/persist/home/"$mainUser"/nixos-config"
if [ ! -d "$configPath" ]; then
mkdir -p $configPath
chown 1000:100 $configPath
fi
cp -aT $flakesPath $configPath
fi
if [ "$oldUefi" = "true" ]; then
mkdir -p /mnt/boot/efi/EFI/Microsoft/Boot
cp /mnt/boot/efi/EFI/BOOT/BOOTX64.EFI /mnt/boot/efi/EFI/Microsoft/Boot/bootmgr.efi
cp /mnt/boot/efi/EFI/BOOT/BOOTX64.EFI /mnt/boot/efi/EFI/Microsoft/Boot/bootmgfw.efi
fi fi
umount -Rl /mnt umount -Rl /mnt

6
modules/autoinstall/default.nix
View File

@ -157,6 +157,11 @@ in{
description = "Path to home user folder relative to persistRoot"; description = "Path to home user folder relative to persistRoot";
}; };
}; };
oldUefi = mkOption {
type = types.bool;
default = false;
description = "Copy bootx64.efi to windows efi location (EFI/Microsoft/Boot/bootmgr.efi)";
};
# rootDevices = mkOption { # rootDevices = mkOption {
# type = types.listOf types.str; # type = types.listOf types.str;
# default = "/dev/sda"; # default = "/dev/sda";
@ -252,6 +257,7 @@ in{
usePersistModule = boolToString cfg.persist.enable; usePersistModule = boolToString cfg.persist.enable;
persistRoot = cfg.persist.persistRoot; persistRoot = cfg.persist.persistRoot;
persistHome = cfg.persist.persistHome; persistHome = cfg.persist.persistHome;
oldUefi = boolToString cfg.oldUefi;
HOME = "/root"; HOME = "/root";
# LIBSH = "${./lib.sh}:${../../static/src/lib.sh}"; # LIBSH = "${./lib.sh}:${../../static/src/lib.sh}";