Author: sandervanderburg
Date: Tue Jan 18 22:49:41 2011
New Revision: 25619
URL: https://svn.nixos.org/websvn/nix/?rev=25619&sc=1
Log:
Removed trick into the activation module, to make using the test functions
easier
Modified:
disnix/disnix-activation-scripts/trunk/activation-scripts/nixos-configuration
disnix/disnix-activation-scripts/trunk/release.nix
Modified:
disnix/disnix-activation-scripts/trunk/activation-scripts/nixos-configuration
==============================================================================
---
disnix/disnix-activation-scripts/trunk/activation-scripts/nixos-configuration
Tue Jan 18 22:45:58 2011 (r25618)
+++
disnix/disnix-activation-scripts/trunk/activation-scripts/nixos-configuration
Tue Jan 18 22:49:41 2011 (r25619)
@@ -3,6 +3,13 @@
# Activation script that activates the given system derivation,
# which makes it possible to remotely upgrade NixOS
+# Trick to make activation script believe that it really is NixOS
+
+if [ ! -f /etc/NIXOS ]
+then
+ touch /etc/NIXOS
+fi
+
if [ "$testNixOS" = "" ]
then
action="switch"
Modified: disnix/disnix-activation-scripts/trunk/release.nix
==============================================================================
--- disnix/disnix-activation-scripts/trunk/release.nix Tue Jan 18 22:45:58
2011 (r25618)
+++ disnix/disnix-activation-scripts/trunk/release.nix Tue Jan 18 22:49:41
2011 (r25619)
@@ -261,7 +261,6 @@
# Test NixOS configuration activation script. We activate the
current
# NixOS configuration
- $machine->mustSucceed("touch /etc/NIXOS"); # trick the system
that it is a NixOS installation
$machine->mustSucceed("disableNixOSSystemProfile=1 testNixOS=1
${disnix_activation_scripts}/libexec/disnix/activation-scripts/nixos-configuration
activate /var/run/current-system");
'';
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
