Author: sandervanderburg
Date: Tue Jan 18 22:45:58 2011
New Revision: 25618
URL: https://svn.nixos.org/websvn/nix/?rev=25618&sc=1
Log:
- Implemented testNixOS option
- Added test case for the nixos-configuration type
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:16:53 2011 (r25617)
+++
disnix/disnix-activation-scripts/trunk/activation-scripts/nixos-configuration
Tue Jan 18 22:45:58 2011 (r25618)
@@ -3,14 +3,21 @@
# Activation script that activates the given system derivation,
# which makes it possible to remotely upgrade NixOS
+if [ "$testNixOS" = "" ]
+then
+ action="switch"
+else
+ action="test"
+fi
+
case "$1" in
activate)
if [ "$disableNixOSSystemProfile" = "" ]
then
nix-env -p /nix/var/nix/profiles/system --set $2
fi
-
- $2/bin/switch-to-configuration switch
+
+ $2/bin/switch-to-configuration $action
;;
deactivate)
if [ "$disableNixOSSystemProfile" = "" ]
@@ -18,6 +25,6 @@
nix-env -p /nix/var/nix/profiles/system --rollback
fi
- $2/bin/switch-to-configuration switch
+ $2/bin/switch-to-configuration $action
;;
esac
Modified: disnix/disnix-activation-scripts/trunk/release.nix
==============================================================================
--- disnix/disnix-activation-scripts/trunk/release.nix Tue Jan 18 22:16:53
2011 (r25617)
+++ disnix/disnix-activation-scripts/trunk/release.nix Tue Jan 18 22:45:58
2011 (r25618)
@@ -257,6 +257,12 @@
$machine->mustSucceed("${subversion}/bin/svn co
file:///repos/testrepos");
$machine->mustSucceed("[ -e testrepos/index.php ]");
$machine->mustSucceed("svnBaseDir=/repos svnGroup=users
${disnix_activation_scripts}/libexec/disnix/activation-scripts/subversion-repository
deactivate ${subversion_repository}");
+
+ # 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
