Skip to content
This repository has been archived by the owner on Aug 27, 2018. It is now read-only.

Commit

Permalink
renaming all occurrences of /var/run/{booted,current}-system
Browse files Browse the repository at this point in the history
in particular those found in docs
still keeping old path in modules/config/shells.nix for unkown reason (?)
  • Loading branch information
MarcWeber authored and edolstra committed Jul 23, 2012
1 parent 5a0cf5e commit 47e67f5
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 12 deletions.
2 changes: 1 addition & 1 deletion doc/manual/man-nixos-rebuild.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ the Nix manual for details.</para>
<variablelist> <variablelist>


<varlistentry> <varlistentry>
<term><filename>/var/run/current-system</filename></term> <term><filename>/run/current-system</filename></term>
<listitem> <listitem>
<para>A symlink to the currently active system configuration in <para>A symlink to the currently active system configuration in
the Nix store.</para> the Nix store.</para>
Expand Down
16 changes: 8 additions & 8 deletions doc/manual/userconfiguration.xml
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@
them found both by Compiz and by Compiz Configuration Settings (also in Compiz Fusion 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. 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 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> <orderedlist>
<listitem><para><filename>$HOME/.compiz/plugins</filename> <listitem><para><filename>$HOME/.compiz/plugins</filename>
should contain plugins you want to load. All the installed should contain plugins you want to load. All the installed
plugins are available in 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. so you can use symlinks to this directory.
</para></listitem> </para></listitem>


<listitem><para><filename>$HOME/.compiz/metadata</filename> <listitem><para><filename>$HOME/.compiz/metadata</filename>
should contain metadata (definition of configuration options) for plugins should contain metadata (definition of configuration options) for plugins
you want to load. All the installed metadata is available in 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. so you can use symlinks to this directory.
</para></listitem> </para></listitem>


Expand All @@ -35,16 +35,16 @@
should be found, but if you run <literal>Compiz</literal> with should be found, but if you run <literal>Compiz</literal> with
<literal>GConf</literal> configuration (default for <literal>X server</literal> job <literal>GConf</literal> configuration (default for <literal>X server</literal> job
for now), you have to link 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. into <filename>$HOME/.compizconfig/backends</filename> directory.
</para></listitem> </para></listitem>


</orderedlist> </orderedlist>


To summarize the above, these are the commands you have to execute 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 /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 /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/compizconfig/backends/ $HOME/.compizconfig/backends</command>


Now you can launch <literal>ccsm</literal> and configure everything. You should select 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> GConf as a backend in the preferences menu of <literal>ccsm</literal>
Expand All @@ -57,7 +57,7 @@
To have pidgin-latex plugin working after installation, you need the following: To have pidgin-latex plugin working after installation, you need the following:
<orderedlist> <orderedlist>
<listitem><para> <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> to <filename>$HOME/.purple/plugins/pidgin-latex.so</filename>
</para></listitem> </para></listitem>
<listitem><para> <listitem><para>
Expand Down
4 changes: 2 additions & 2 deletions gui/chrome/content/nixos.js
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ NixOS.prototype = {
nixos: "/etc/nixos/nixos", nixos: "/etc/nixos/nixos",
nixpkgs: "/etc/nixos/nixpkgs", nixpkgs: "/etc/nixos/nixpkgs",
config: "/etc/nixos/configuration.nix", config: "/etc/nixos/configuration.nix",
instantiateBin: "/var/run/current-system/sw/bin/nix-instantiate", instantiateBin: "/run/current-system/sw/bin/nix-instantiate",
optionBin: "/var/run/current-system/sw/bin/nixos-option", optionBin: "/run/current-system/sw/bin/nixos-option",
tmpFile: "nixos-gui", tmpFile: "nixos-gui",
option: null option: null
}; };
Expand Down
2 changes: 1 addition & 1 deletion lib/test-driver/test-driver.pl
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ sub runTests {
# Figure out where to put the *.gcda files so that the # Figure out where to put the *.gcda files so that the
# report generator can find the corresponding kernel # report generator can find the corresponding kernel
# sources. # 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; chomp $kernelDir;
my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir"; my $coverageDir = "/tmp/xchg/coverage-data/$kernelDir";


Expand Down

0 comments on commit 47e67f5

Please sign in to comment.