Commit 0f6624e
committed
nixos-rebuild-ng: validate NixOS config path in target host
In #418243 we started to validate NixOS config path to avoid a nasty bug
in Nix, but this doesn't work in the `--build-host` and `--target-host`
case because the configuration will not be available in the local host
to check if it contains a `nixos-version`. This moves the check to
`--target-host` instead, that is probably the correct choice anyway.
Fix #418868.1 parent 7c796b5 commit 0f6624e
File tree
3 files changed
+43
-25
lines changed- pkgs/by-name/ni/nixos-rebuild-ng/src
- nixos_rebuild
- tests
3 files changed
+43
-25
lines changedLines changed: 0 additions & 25 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
9 | 8 | | |
10 | 9 | | |
11 | 10 | | |
| |||
338 | 337 | | |
339 | 338 | | |
340 | 339 | | |
341 | | - | |
342 | | - | |
343 | | - | |
344 | | - | |
345 | | - | |
346 | | - | |
347 | | - | |
348 | | - | |
349 | | - | |
350 | | - | |
351 | | - | |
352 | | - | |
353 | | - | |
354 | | - | |
355 | | - | |
356 | | - | |
357 | | - | |
358 | | - | |
359 | | - | |
360 | | - | |
361 | | - | |
362 | | - | |
363 | | - | |
364 | 340 | | |
365 | 341 | | |
366 | 342 | | |
| |||
514 | 490 | | |
515 | 491 | | |
516 | 492 | | |
517 | | - | |
518 | 493 | | |
519 | 494 | | |
520 | 495 | | |
| |||
Lines changed: 28 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| 12 | + | |
12 | 13 | | |
13 | 14 | | |
14 | 15 | | |
| |||
613 | 614 | | |
614 | 615 | | |
615 | 616 | | |
| 617 | + | |
| 618 | + | |
| 619 | + | |
| 620 | + | |
| 621 | + | |
| 622 | + | |
| 623 | + | |
| 624 | + | |
| 625 | + | |
| 626 | + | |
| 627 | + | |
| 628 | + | |
| 629 | + | |
| 630 | + | |
| 631 | + | |
| 632 | + | |
| 633 | + | |
| 634 | + | |
| 635 | + | |
| 636 | + | |
| 637 | + | |
| 638 | + | |
| 639 | + | |
| 640 | + | |
| 641 | + | |
| 642 | + | |
| 643 | + | |
616 | 644 | | |
617 | 645 | | |
618 | 646 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
674 | 674 | | |
675 | 675 | | |
676 | 676 | | |
| 677 | + | |
| 678 | + | |
677 | 679 | | |
678 | 680 | | |
679 | 681 | | |
| |||
687 | 689 | | |
688 | 690 | | |
689 | 691 | | |
| 692 | + | |
| 693 | + | |
| 694 | + | |
| 695 | + | |
| 696 | + | |
| 697 | + | |
| 698 | + | |
| 699 | + | |
| 700 | + | |
| 701 | + | |
| 702 | + | |
| 703 | + | |
| 704 | + | |
690 | 705 | | |
691 | 706 | | |
692 | 707 | | |
| |||
0 commit comments