From 6c792b3d9e8224ca36d84d367735631d08929b23 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
Date: Sun, 4 Mar 2012 15:47:44 +0000
Subject: [PATCH] * A more pragmatic solution to the missing tar manpage
 problem.

svn path=/nixos/trunk/; revision=32770
---
 modules/config/system-path.nix         | 11 +++++++++--
 modules/module-list.nix                |  2 +-
 modules/services/networking/dhcpcd.nix |  5 ++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/modules/config/system-path.nix b/modules/config/system-path.nix
index 59183d1f1a2..d989ddf4b91 100644
--- a/modules/config/system-path.nix
+++ b/modules/config/system-path.nix
@@ -1,7 +1,7 @@
 # This module defines the packages that appear in
 # /var/run/current-system/sw.
 
-{pkgs, config, ...}:
+{ config, pkgs, ... }:
 
 with pkgs.lib;
 
@@ -9,6 +9,12 @@ let
 
   cfg = config.environment;
 
+  extraManpages = pkgs.runCommand "extra-manpages" { buildInputs = [ pkgs.help2man ]; }
+    ''
+      mkdir -p $out/share/man/man1
+      help2man ${pkgs.gnutar}/bin/tar > $out/share/man/man1/tar.1
+    '';
+
   requiredPackages =
     [ config.system.sbin.modprobe # must take precedence over module_init_tools
       config.system.sbin.mount # must take precedence over util-linux
@@ -29,7 +35,7 @@ let
       pkgs.gnugrep
       pkgs.gnupatch
       pkgs.gnused
-      pkgs.gnutarWithMan
+      pkgs.gnutar
       pkgs.gzip
       pkgs.less
       pkgs.libcap
@@ -52,6 +58,7 @@ let
       pkgs.udev
       pkgs.usbutils
       pkgs.utillinux
+      extraManpages      
     ];
 
 
diff --git a/modules/module-list.nix b/modules/module-list.nix
index 7d42571d0fa..2a4e88439a9 100644
--- a/modules/module-list.nix
+++ b/modules/module-list.nix
@@ -113,7 +113,7 @@
   ./services/networking/bitlbee.nix
   ./services/networking/cntlm.nix
   ./services/networking/ddclient.nix
-  ./services/networking/dhclient.nix
+  ./services/networking/dhcpcd.nix
   ./services/networking/dhcpd.nix
   ./services/networking/dnsmasq.nix
   ./services/networking/ejabberd.nix
diff --git a/modules/services/networking/dhcpcd.nix b/modules/services/networking/dhcpcd.nix
index 01c65c06865..d1a291c4da9 100644
--- a/modules/services/networking/dhcpcd.nix
+++ b/modules/services/networking/dhcpcd.nix
@@ -33,6 +33,9 @@ let
       # Ethernet cards used for bridging.  Likewise for vif* and tap*
       # (Xen) and virbr* and vnet* (libvirt).
       denyinterfaces ${toString ignoredInterfaces} peth* vif* tap* tun* virbr* vnet* vboxnet*
+
+      # Disable listening for IPv6 Router Advertisements for now.
+      noipv6rs
     '';
 
   # Hook for emitting ip-up/ip-down events.
@@ -72,7 +75,7 @@ in
 
         path = [ dhcpcd pkgs.nettools pkgs.openresolv ];
 
-        exec = "dhcpcd --config ${dhcpcdConf} --nobackground --persistent";
+        exec = "dhcpcd --config ${dhcpcdConf} --nobackground";
       };
 
     environment.systemPackages = [ dhcpcd ];