From 0b865edb16f834684726903c35e946685c5eafdf Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Fri, 20 Jul 2012 16:23:52 -0400
Subject: [PATCH] switch-to-configuration: require a reboot going from Upstart
 to systemd

---
 .../system/activation/switch-to-configuration.sh   | 14 +++++++-------
 modules/system/activation/top-level.nix            |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/system/activation/switch-to-configuration.sh b/modules/system/activation/switch-to-configuration.sh
index 62af63ec39f..0256100f4ec 100644
--- a/modules/system/activation/switch-to-configuration.sh
+++ b/modules/system/activation/switch-to-configuration.sh
@@ -59,16 +59,16 @@ fi
 # Activate the new configuration.
 if [ "$action" != switch -a "$action" != test ]; then exit 0; fi
 
-oldVersion=$(cat /run/current-system/upstart-interface-version 2> /dev/null || echo 0)
-newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0)
+oldVersion="$(cat /run/current-system/init-interface-version 2> /dev/null || echo "")"
+newVersion="$(cat @out@/init-interface-version)"
 
-if test "$oldVersion" -ne "$newVersion"; then
+if [ "$oldVersion" != "$newVersion" ]; then
         cat <<EOF
-Warning: the new NixOS configuration has an Upstart version that is
-incompatible with the current version.  The new configuration won't
-take effect until you reboot the system.
+Warning: the new NixOS configuration has an ‘init’ that is
+incompatible with the current configuration.  The new configuration
+won't take effect until you reboot the system.
 EOF
-        exit 1
+        exit 100 # denotes "reboot required" to Charon
 fi
 
 # Ignore SIGHUP so that we're not killed if we're running on (say)
diff --git a/modules/system/activation/top-level.nix b/modules/system/activation/top-level.nix
index ef32d991d9d..e6c201ea2ba 100644
--- a/modules/system/activation/top-level.nix
+++ b/modules/system/activation/top-level.nix
@@ -122,7 +122,7 @@ let
 
       echo -n "$kernelParams" > $out/kernel-params
       echo -n "$configurationName" > $out/configuration-name
-      #echo -n "${toString config.system.build.upstart.interfaceVersion}" > $out/upstart-interface-version
+      echo -n "systemd ${toString config.system.build.systemd.interfaceVersion}" > $out/init-interface-version
       echo -n "$nixosVersion" > $out/nixos-version
 
       mkdir $out/fine-tune