public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch-to-configuration: require a reboot going from Upstart to systemd

This commit is contained in:
Eelco Dolstra 2012-07-20 16:23:52 -04:00
parent 5fabcf63a3
commit 0b865edb16
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
modules/system/activation/switch-to-configuration.sh
View File

@ -59,16 +59,16 @@ fi
# Activate the new configuration. # Activate the new configuration.
if [ "$action" != switch -a "$action" != test ]; then exit 0; fi if [ "$action" != switch -a "$action" != test ]; then exit 0; fi
oldVersion=$(cat /run/current-system/upstart-interface-version 2> /dev/null || echo 0) oldVersion="$(cat /run/current-system/init-interface-version 2> /dev/null || echo "")"
newVersion=$(cat @out@/upstart-interface-version 2> /dev/null || echo 0) newVersion="$(cat @out@/init-interface-version)"
if test "$oldVersion" -ne "$newVersion"; then if [ "$oldVersion" != "$newVersion" ]; then
cat <<EOF cat <<EOF
Warning: the new NixOS configuration has an Upstart version that is Warning: the new NixOS configuration has an ‘init’ that is
incompatible with the current version. The new configuration won't incompatible with the current configuration. The new configuration
take effect until you reboot the system. won't take effect until you reboot the system.
EOF EOF
exit 1 exit 100 # denotes "reboot required" to Charon
fi fi
# Ignore SIGHUP so that we're not killed if we're running on (say) # Ignore SIGHUP so that we're not killed if we're running on (say)

2
modules/system/activation/top-level.nix
View File

@ -122,7 +122,7 @@ let
echo -n "$kernelParams" > $out/kernel-params echo -n "$kernelParams" > $out/kernel-params
echo -n "$configurationName" > $out/configuration-name 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 echo -n "$nixosVersion" > $out/nixos-version
mkdir $out/fine-tune mkdir $out/fine-tune