From 47e67f5e9caf22bd9f33047d90e73fdc686acef3 Mon Sep 17 00:00:00 2001
From: Marc Weber <marco-oweber@gmx.de>
Date: Mon, 23 Jul 2012 03:19:02 +0200
Subject: [PATCH] renaming all occurrences of /var/run/{booted,current}-system

in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
---
 doc/manual/man-nixos-rebuild.xml |  2 +-
 doc/manual/userconfiguration.xml | 16 ++++++++--------
 gui/chrome/content/nixos.js      |  4 ++--
 lib/test-driver/test-driver.pl   |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/doc/manual/man-nixos-rebuild.xml b/doc/manual/man-nixos-rebuild.xml
index 383334d82e1..ddf4e40be0c 100644
--- a/doc/manual/man-nixos-rebuild.xml
+++ b/doc/manual/man-nixos-rebuild.xml
@@ -281,7 +281,7 @@ the Nix manual for details.</para>
 <variablelist>
 
   <varlistentry>
-    <term><filename>/var/run/current-system</filename></term>
+    <term><filename>/run/current-system</filename></term>
     <listitem>
       <para>A symlink to the currently active system configuration in
       the Nix store.</para>
diff --git a/doc/manual/userconfiguration.xml b/doc/manual/userconfiguration.xml
index 2cad256c742..7c6540caf3a 100644
--- a/doc/manual/userconfiguration.xml
+++ b/doc/manual/userconfiguration.xml
@@ -13,20 +13,20 @@
 	them found both by Compiz and by Compiz Configuration Settings (also in Compiz Fusion
 	distribution). By default they look in Compiz installation path and in home directory.
 	You do not need to track /nix/store manually - everything is already in 
-	/var/run/current-system/sw/share.
+	/run/current-system/sw/share.
 
 	<orderedlist>
 	<listitem><para><filename>$HOME/.compiz/plugins</filename> 
 	should contain plugins you want to load. All the installed 
 	plugins are available in 
-	<filename>/var/run/current-system/sw/share/compiz-plugins/compiz/</filename>,
+	<filename>/run/current-system/sw/share/compiz-plugins/compiz/</filename>,
 	so you can use symlinks to this directory.
 	</para></listitem>
 
 	<listitem><para><filename>$HOME/.compiz/metadata</filename> 
 	should contain metadata (definition of configuration options) for plugins 
 	you want to load. All the installed metadata is available in 
-	<filename>/var/run/current-system/sw/share/compiz/</filename>,
+	<filename>/run/current-system/sw/share/compiz/</filename>,
 	so you can use symlinks to this directory.
 	</para></listitem>
 
@@ -35,16 +35,16 @@
 	should be found, but if you run <literal>Compiz</literal> with 
 	<literal>GConf</literal> configuration (default for <literal>X server</literal> job
 	for now), you have to link 
-	<filename>/var/run/current-system/sw/share/compizconfig/backends/</filename>
+	<filename>/run/current-system/sw/share/compizconfig/backends/</filename>
 	into <filename>$HOME/.compizconfig/backends</filename> directory.
 	</para></listitem>
 
 	</orderedlist>
 
         To summarize the above, these are the commands you have to execute
-        <command>ln -s /var/run/current-system/sw/share/compiz/ $HOME/.compiz/metadata</command>
-        <command>ln -s /var/run/current-system/sw/share/compiz-plugins/compiz/ $HOME/.compiz/plugins</command>
-        <command>ln -s /var/run/current-system/sw/share/compizconfig/backends/ $HOME/.compizconfig/backends</command>
+        <command>ln -s /run/current-system/sw/share/compiz/ $HOME/.compiz/metadata</command>
+        <command>ln -s /run/current-system/sw/share/compiz-plugins/compiz/ $HOME/.compiz/plugins</command>
+        <command>ln -s /run/current-system/sw/share/compizconfig/backends/ $HOME/.compizconfig/backends</command>
 
 	Now you can launch <literal>ccsm</literal> and configure everything. You should select
 	GConf as a backend in the preferences menu of <literal>ccsm</literal>
@@ -57,7 +57,7 @@
 	To have pidgin-latex plugin working after installation, you need the following:
 	<orderedlist>
 	<listitem><para>
-	Symlink <filename>/var/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
+	Symlink <filename>/run/current-system/sw/share/pidgin-latex/pidgin-latex.so</filename>
 	to <filename>$HOME/.purple/plugins/pidgin-latex.so</filename>
 	</para></listitem>
 	<listitem><para>
diff --git a/gui/chrome/content/nixos.js b/gui/chrome/content/nixos.js
index 7b45b6c006a..63a3c16a573 100644
--- a/gui/chrome/content/nixos.js
+++ b/gui/chrome/content/nixos.js
@@ -21,8 +21,8 @@ NixOS.prototype = {
   nixos: "/etc/nixos/nixos",
   nixpkgs: "/etc/nixos/nixpkgs",
   config: "/etc/nixos/configuration.nix",
-  instantiateBin: "/var/run/current-system/sw/bin/nix-instantiate",
-  optionBin: "/var/run/current-system/sw/bin/nixos-option",
+  instantiateBin: "/run/current-system/sw/bin/nix-instantiate",
+  optionBin: "/run/current-system/sw/bin/nixos-option",
   tmpFile: "nixos-gui",
   option: null
 };
diff --git a/lib/test-driver/test-driver.pl b/lib/test-driver/test-driver.pl
index 43f74cf404b..6c95f5ba517 100644
--- a/lib/test-driver/test-driver.pl
+++ b/lib/test-driver/test-driver.pl
@@ -135,7 +135,7 @@ sub runTests {
             # Figure out where to put the *.gcda files so that the
             # report generator can find the corresponding kernel
             # sources.
-            my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /var/run/current-system/kernel))/.build/linux-*");
+            my $kernelDir = $vm->mustSucceed("echo \$(dirname \$(readlink -f /run/current-system/kernel))/.build/linux-*");
             chomp $kernelDir;
             my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir";