diff --git a/modules/installer/tools/nixos-rebuild.sh b/modules/installer/tools/nixos-rebuild.sh index cad1308355f..bb69c372aa4 100644 --- a/modules/installer/tools/nixos-rebuild.sh +++ b/modules/installer/tools/nixos-rebuild.sh @@ -132,8 +132,9 @@ fi # current one. Of course, the same goes for Nixpkgs, but Nixpkgs is # more conservative. if test -n "$buildNix"; then - if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix; then - nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix + echo "building Nix..." >&2 + if ! nix-build $NIXOS -A nixFallback -o $tmpDir/nix > /dev/null; then + nix-build $NIXPKGS -A nixUnstable -o $tmpDir/nix > /dev/null fi PATH=$tmpDir/nix/bin:$PATH fi @@ -143,14 +144,15 @@ fi # or "boot"), or just build it and create a symlink "result" in the # current directory (for "build" and "test"). if test -z "$rollback"; then + echo "building the system configuration..." >&2 if test "$action" = switch -o "$action" = boot; then nix-env -p /nix/var/nix/profiles/system -f $NIXOS --set -A system $extraBuildFlags pathToConfig=/nix/var/nix/profiles/system elif test "$action" = test -o "$action" = build -o "$action" = dry-run; then - nix-build $NIXOS -A system -K -k $extraBuildFlags + nix-build $NIXOS -A system -K -k $extraBuildFlags > /dev/null pathToConfig=./result elif test "$action" = build-vm; then - nix-build $NIXOS -A vm -K -k $extraBuildFlags + nix-build $NIXOS -A vm -K -k $extraBuildFlags > /dev/null pathToConfig=./result else showSyntax diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh index 18a0664daa7..d4b70c3b379 100644 --- a/modules/system/activation/switch-to-configuration.sh +++ b/modules/system/activation/switch-to-configuration.sh @@ -57,9 +57,6 @@ EOF oldJobs=$(readlink -f /etc/static/init) newJobs=$(readlink -f @out@/etc/init) - echo "old: $oldJobs" - echo "new: $newJobs" - stopJob() { local job=$1 initctl stop "$job" || true