From 0ad27c8653daaf59cf0fb2e0b30561a8d86303fa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 28 Jul 2021 17:06:03 +0200 Subject: nixos-rebuild: Set inherit_errexit Without this, failure of nixBuild() and nixFlakeBuild() was ignored (since bash doesn't inherit 'set -e' in subshells by default), so the script would proceed with a bogus ./result link, e.g. ++ readlink -f /tmp/nixos-rebuild.NfHKxx/result + pathToConfig='/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result' + '[' test = switch -o test = boot ']' + copyToTarget '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result' + '[' '' = '' ']' + '[' test = switch -o test = boot -o test = test -o test = dry-activate ']' + targetHostCmd /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test + '[' -z '' ']' + sudo -- /nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix /tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration test error: '/tmp/nixos-rebuild.NfHKxx/result/bin/switch-to-configuration' is not a recognised command Try '/nix/store/m7dvk6an18cpr95qn5wnig2600qhv6w7-nix-2.4pre20210727_706777a/bin/nix --help' for more information. + echo 'warning: error(s) occurred while switching to the new configuration' warning: error(s) occurred while switching to the new configuration --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh') diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 69e0dee1d20..6d082cb100e 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -4,6 +4,7 @@ if [ -x "@runtimeShell@" ]; then export SHELL="@runtimeShell@"; fi; set -e set -o pipefail +shopt -s inherit_errexit export PATH=@path@:$PATH -- cgit 1.4.1 From 9b0a99f64c9e61b6176238d9c3eabdcfa61723db Mon Sep 17 00:00:00 2001 From: brprice Date: Sat, 31 Jul 2021 14:54:37 +0000 Subject: nixos-rebuild: print run-*-vm location with bootloader (#130385) Previously when doing a nixos-rebuild build-vm we see a message saying how to run the VM, but with nixos-rebuild build-vm-with-bootloader we did not. We now show it in both cases. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh') diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 6d082cb100e..b0363fa7a7c 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -520,7 +520,7 @@ if [ "$action" = switch -o "$action" = boot -o "$action" = test -o "$action" = d fi -if [ "$action" = build-vm ]; then +if [ "$action" = build-vm -o "$action" = build-vm-with-bootloader ]; then cat >&2 <