alejandro-angulo/dotfiles
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Removed extraneous mounts

Browse source 
Mounts are already happening due to config in associated
hardware-configuration files.
This commit is contained in:
Alejandro Angulo 2023-04-06 19:34:49 -07:00
parent a62a059a99
commit b098765485
Signed by: alejandro-angulo
GPG key ID: 75579581C74554B6
2 changed files with 0 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
systems/x86_64-linux/carbon/zfs.nix
View file

@ -34,12 +34,6 @@
grub.copyKernels = true; grub.copyKernels = true;
grub.efiSupport = true; grub.efiSupport = true;
grub.zfsSupport = true; grub.zfsSupport = true;
# for systemd-autofs
grub.extraPrepareConfig = ''
mkdir -p /boot/efis /boot/efi
for i in /boot/efis/*; do mount $i ; done
mount /boot/efi
'';
grub.extraInstallCommands = '' grub.extraInstallCommands = ''
export ESP_MIRROR=$(mktemp -d -p /tmp) export ESP_MIRROR=$(mktemp -d -p /tmp)
cp -r /boot/efis/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part1/EFI $ESP_MIRROR cp -r /boot/efis/nvme-SAMSUNG_MZVLW256HEHP-000L7_S35ENX1K539085-part1/EFI $ESP_MIRROR

18
systems/x86_64-linux/gospel/zfs.nix
View file

@ -15,24 +15,6 @@
boot.loader.grub.copyKernels = true; boot.loader.grub.copyKernels = true;
boot.loader.grub.efiSupport = true; boot.loader.grub.efiSupport = true;
boot.loader.grub.zfsSupport = true; boot.loader.grub.zfsSupport = true;
boot.loader.grub.extraPrepareConfig = ''
mkdir -p /boot/efis
for i in /boot/efis/* ; do
(mount | grep -q "$i")
isDirectoryMounted=$?
if (test $isDirectoryMounted -ne 0); then
mount "$i"
fi
done
mkdir -p /boot/efi
# mount /boot/efi
(mount | grep -q /boot/efi)
isDirectoryMounted=$?
if (test $isDirectoryMounted -ne 0); then
mount /boot/efi
fi
'';
boot.loader.grub.extraInstallCommands = '' boot.loader.grub.extraInstallCommands = ''
ESP_MIRROR=$(mktemp -d) ESP_MIRROR=$(mktemp -d)
cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR cp -r /boot/efis/nvme-WDC_WDS100T2B0C-00PXH0_21111Y801086-part1/EFI $ESP_MIRROR