From 2ac3dd4bd727f2554a3e611f0e665df88af9a037 Mon Sep 17 00:00:00 2001 From: Keea Date: Wed, 3 Jul 2024 19:39:49 -0700 Subject: [PATCH 1/2] explicitly check for ESP mount --- nixos-infect | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/nixos-infect b/nixos-infect index 06f0171..580f2d4 100644 --- a/nixos-infect +++ b/nixos-infect @@ -224,7 +224,7 @@ findESP() { && esp="$(df "$d" --output=source | sed 1d)" \ && break done - [[ -z "$esp" ]] && { echo "ERROR: No ESP mount point found"; return 1; } + [[ -z "$esp" ]] && { echo "WARNING: No ESP mount point found"; return 1; } for uuid in /dev/disk/by-uuid/*; do [[ $(readlink -f "$uuid") == "$esp" ]] && echo $uuid && return 0 done @@ -232,9 +232,8 @@ findESP() { prepareEnv() { # $esp and $grubdev are used in makeConf() - if isEFI; then - esp="$(findESP)" - else + esp="$(findESP)" + if ! isEFI; then for grubdev in /dev/vda /dev/sda /dev/xvda /dev/nvme0n1 ; do [[ -e $grubdev ]] && break; done fi @@ -371,7 +370,7 @@ infect() { (cd / && ls etc/ssh/ssh_host_*_key* || true) >> /etc/NIXOS_LUSTRATE rm -rf /boot.bak - isEFI && umount "$esp" + [[ -z "$esp" ]] || umount "$esp" mv -v /boot /boot.bak || { cp -a /boot /boot.bak ; rm -rf /boot/* ; umount /boot ; } if isEFI; then From 6f270573c542cd5acbb23563cedb4b7e18ebcab8 Mon Sep 17 00:00:00 2001 From: Taylor Osler <1066487+keeakita@users.noreply.github.com> Date: Mon, 26 Aug 2024 10:25:05 -0700 Subject: [PATCH 2/2] add 24.04 on DigitalOcean to README --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 1cc44be..ce6b643 100644 --- a/README.md +++ b/README.md @@ -122,6 +122,8 @@ runcmd: |Ubuntu |22.04 x64 |**success**|2023-06-05| |Ubuntu |22.10 x64 | _failure_ |2023-06-05| |Ubuntu |23.10 x64 | _failure_ |2023-11-16| +|Ubuntu |24.04 x64 |**success**|2024-07-03| + ### Vultr To set up a NixOS Vultr server, instantiate an Ubuntu box with the following "Cloud-Init User-Data":