Author: sandervanderburg
Date: Tue Jan 18 16:27:39 2011
New Revision: 25609
URL: https://svn.nixos.org/websvn/nix/?rev=25609&sc=1
Log:
Added --no-out-link and --show-trace options to disnix-gendist-roundrobin
Modified:
disnix/disnix/trunk/doc/manual/disnix-gendist-roundrobin.xml
disnix/disnix/trunk/scripts/disnix-gendist-roundrobin.in
Modified: disnix/disnix/trunk/doc/manual/disnix-gendist-roundrobin.xml
==============================================================================
--- disnix/disnix/trunk/doc/manual/disnix-gendist-roundrobin.xml Tue Jan
18 09:34:52 2011 (r25608)
+++ disnix/disnix/trunk/doc/manual/disnix-gendist-roundrobin.xml Tue Jan
18 16:27:39 2011 (r25609)
@@ -54,13 +54,29 @@
</listitem>
</varlistentry>
<varlistentry>
+ <term><option>--no-out-link</option></term>
+ <listitem>
+ <para>
+ Do not create a 'result' symlink
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--show-trace</option></term>
+ <listitem>
+ <para>
+ Shows a trace of the output.
+ </para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
<term><option>-h</option>,
<option>--help</option></term>
<listitem>
<para>
Shows the usage of this command
to the user.
</para>
</listitem>
- </varlistentry>
+ </varlistentry>
</variablelist>
</refsection>
</refentry>
Modified: disnix/disnix/trunk/scripts/disnix-gendist-roundrobin.in
==============================================================================
--- disnix/disnix/trunk/scripts/disnix-gendist-roundrobin.in Tue Jan 18
09:34:52 2011 (r25608)
+++ disnix/disnix/trunk/scripts/disnix-gendist-roundrobin.in Tue Jan 18
16:27:39 2011 (r25609)
@@ -25,6 +25,8 @@
echo
echo "-s,--services Services Nix expression which describes all
components of the distributed system"
echo "-i,--infrastructure Infrastructure Nix expression which captures
properties of machines in the network"
+ echo "--no-out-link Do not create a 'result' symlink"
+ echo "--show-trace Shows a trace of the output"
echo "-h,--help Shows the usage of this command to the user"
}
@@ -38,7 +40,7 @@
# Parse valid argument options
-PARAMS=`getopt -n $0 -o s:i:h -l services:,infrastructure:,help -- "$@"`
+PARAMS=`getopt -n $0 -o s:i:h -l
services:,infrastructure:,no-out-link,show-trace,help -- "$@"`
if [ $? != 0 ]
then
@@ -59,6 +61,12 @@
-i|--infrastructure)
infrastructureFile=`readlink -f $2`
;;
+ --no-out-link)
+ noOutLink=1
+ ;;
+ --show-trace)
+ showTrace=1
+ ;;
-h|--help)
showUsage
exit 0
@@ -72,9 +80,14 @@
checkServicesFile
checkInfrastructureFile
+checkNoOutLink
+checkShowTrace
# Build the distribution model
nix-build --argstr servicesFile "$(readlink -f $servicesFile)" \
--argstr infrastructureFile "$(readlink -f $infrastructureFile)" \
- "$(readlink -f @datadir@/@PACKAGE@/gendist-roundrobin.nix)"
+ "$(readlink -f @datadir@/@PACKAGE@/gendist-roundrobin.nix)" \
+ $noOutLinkArg \
+ $showTraceArg
+
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
