[SCM] Debian GNU Hurd packaging branch, master, updated. upstream/20110303-447-gad0a133

[Samuel Thibault]

The following commit has been merged in the master branch:
commit ad0a13309885f302d8b9ee5abe81affbe3c9c102
Author: Samuel Thibault <address@hidden>
Date:   Tue Mar 8 18:07:10 2011 +0100

    Fix DHCP network configuration transfer
    
      * debian/local/finish-install.d/51hurd_config-target-network: Record 
active
        network configuration, not only passive. Create /servers/socket/26 node 
if
        it doesn't exist yet.

diff --git a/debian/changelog b/debian/changelog
index 9cf1dbe..80e1e17 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,9 @@ hurd (20110303-1) UNRELEASED; urgency=low
     reauthentication issue triggered by sudo.
   * debian/patches/libpager_deadlock.patch: Add patch to fix a known
     synchronization deadlock.
+  * debian/local/finish-install.d/51hurd_config-target-network: Record active
+    network configuration, not only passive. Create /servers/socket/26 node if
+    it doesn't exist yet.
 
   [ Justus Winter ]
   * debian/hurd.{postinst,postrm}: Add/remove loginpr shell and login user with
diff --git a/debian/local/finish-install.d/51hurd_config-target-network 
b/debian/local/finish-install.d/51hurd_config-target-network
index 94a7c2e..1319165 100755
--- a/debian/local/finish-install.d/51hurd_config-target-network
+++ b/debian/local/finish-install.d/51hurd_config-target-network
@@ -4,6 +4,6 @@
 settrans -ag /target/servers
 
 # Transfer the network configuration to /target
-settrans -pk /target/servers/socket/2 $(showtrans /servers/socket/2) -6 
/servers/socket/26
-settrans -pk /target/servers/socket/26 $(showtrans /servers/socket/2) -4 
/servers/socket/2
+settrans -pk /target/servers/socket/2 $(fsysopts /servers/socket/2) -6 
/servers/socket/26
+settrans -cpk /target/servers/socket/26 $(fsysopts /servers/socket/2) -4 
/servers/socket/2
 

-- 
Debian GNU Hurd packaging