Author: sandervanderburg
Date: Fri Oct 22 11:28:46 2010
New Revision: 24415
URL: https://svn.nixos.org/websvn/nix/?rev=24415&sc=1
Log:
Removed all references to the old backdoor and virtualisation techniques. Now
NixOS' qemu-vm.nix and tooling is used, so I guess my technical debt is much
lower now :)
Deleted:
disnix/disnix-vm-addons/trunk/data/backdoor.nix
disnix/disnix-vm-addons/trunk/data/build-vms.nix
disnix/disnix-vm-addons/trunk/data/qemu-vm.nix
disnix/disnix-vm-addons/trunk/data/vms.nix
disnix/disnix-vm-addons/trunk/scripts/disnix-generate-vms.in
Modified:
disnix/disnix-vm-addons/trunk/configure.ac
disnix/disnix-vm-addons/trunk/data/Makefile.am
disnix/disnix-vm-addons/trunk/data/generate-infrastructure.nix
disnix/disnix-vm-addons/trunk/scripts/Makefile.am
disnix/disnix-vm-addons/trunk/scripts/disnix-vm-env
Modified: disnix/disnix-vm-addons/trunk/configure.ac
==============================================================================
--- disnix/disnix-vm-addons/trunk/configure.ac Fri Oct 22 11:00:02 2010
(r24414)
+++ disnix/disnix-vm-addons/trunk/configure.ac Fri Oct 22 11:28:46 2010
(r24415)
@@ -32,6 +32,5 @@
data/Makefile
scripts/disnix-backdoor-client
scripts/disnix-generate-infra
-scripts/disnix-generate-vms
])
AC_OUTPUT
Modified: disnix/disnix-vm-addons/trunk/data/Makefile.am
==============================================================================
--- disnix/disnix-vm-addons/trunk/data/Makefile.am Fri Oct 22 11:00:02
2010 (r24414)
+++ disnix/disnix-vm-addons/trunk/data/Makefile.am Fri Oct 22 11:28:46
2010 (r24415)
@@ -1,2 +1,2 @@
-pkgdata_DATA = backdoor.nix build-vms.nix generate-infrastructure.nix
qemu-vm.nix vms.nix
-EXTRA_DIST = backdoor.nix build-vms.nix generate-infrastructure.nix
qemu-vm.nix vms.nix
+pkgdata_DATA = generate-infrastructure.nix
+EXTRA_DIST = generate-infrastructure.nix
Modified: disnix/disnix-vm-addons/trunk/data/generate-infrastructure.nix
==============================================================================
--- disnix/disnix-vm-addons/trunk/data/generate-infrastructure.nix Fri Oct
22 11:00:02 2010 (r24414)
+++ disnix/disnix-vm-addons/trunk/data/generate-infrastructure.nix Fri Oct
22 11:28:46 2010 (r24415)
@@ -14,7 +14,7 @@
config = (import /etc/nixos/nixos/lib/eval-config.nix { modules = [
configuration ]; }).config;
in
" "+targetName+" = {\n"+
- " backdoor = \"@[email protected]\";\n"+
+ " backdoor = \"${targetName}.socket\";\n"+
" hostname = \"${targetName}\";\n"+
" system = \"i686-linux\";"
+
@@ -39,13 +39,5 @@
cat > $out <<EOF
${infrastructureString}
EOF
-
-port=65280
-
-while [ "$(grep "@port@" $out)" != "" ]
-do
- port2=$((port++))
- sed -i -e "0,/@port@/s//$port2/" $out
-done
'';
}
Modified: disnix/disnix-vm-addons/trunk/scripts/Makefile.am
==============================================================================
--- disnix/disnix-vm-addons/trunk/scripts/Makefile.am Fri Oct 22 11:00:02
2010 (r24414)
+++ disnix/disnix-vm-addons/trunk/scripts/Makefile.am Fri Oct 22 11:28:46
2010 (r24415)
@@ -1,3 +1,3 @@
-bin_SCRIPTS = disnix-backdoor-client disnix-generate-infra disnix-generate-vms
disnix-vm-env
+bin_SCRIPTS = disnix-backdoor-client disnix-generate-infra disnix-vm-env
-EXTRA_DIST = disnix-backdoor-client.in disnix-generate-infra.in
disnix-generate-vms.in disnix-vm-env
+EXTRA_DIST = disnix-backdoor-client.in disnix-generate-infra.in disnix-vm-env
Modified: disnix/disnix-vm-addons/trunk/scripts/disnix-vm-env
==============================================================================
--- disnix/disnix-vm-addons/trunk/scripts/disnix-vm-env Fri Oct 22 11:00:02
2010 (r24414)
+++ disnix/disnix-vm-addons/trunk/scripts/disnix-vm-env Fri Oct 22 11:28:46
2010 (r24415)
@@ -94,7 +94,7 @@
fi
# Generate virtual machines matching the configuration in the network Nix
expression
-vmsPath=`disnix-generate-vms $networkFile`
+vmsPath=`nixos-build-vms --use-backdoor -n $networkFile`
# Generate infrastructure expression from network expression
infrastructureFile=`disnix-generate-infra $networkFile`
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
