[debian-edu-commits] r80001 - in branches/wheezy/debian-edu-config: debian share/debian-edu-config/tools

[pere at alioth.debian.org]

Author: pere
Date: 2013-05-07 05:36:06 +0000 (Tue, 07 May 2013)
New Revision: 80001

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming
Log:
Fix typo in tools/setup-roaming causing nsswitch.conf update to
fail.  Make the generated nsswitch.conf closer to the one
generated automatically by debian packages, to make it easier to
see which lines we have to change to get roaming workstations
working.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-05-07 01:38:27 UTC (rev 80000)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-05-07 05:36:06 UTC (rev 80001)
@@ -1,3 +1,14 @@
+debian-edu-config (1.704~svn79995) wheezy-test; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Fix typo in tools/setup-roaming causing nsswitch.conf update to
+    fail.  Make the generated nsswitch.conf closer to the one
+    generated automatically by debian packages, to make it easier to
+    see which lines we have to change to get roaming workstations
+    working.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 07 May 2013 07:32:27 +0200
+
 debian-edu-config (1.704~svn79994) wheezy-test; urgency=low
 
   [ Wolfgang Schweer ]

Modified: branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming
===================================================================
--- branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming	2013-05-07 01:38:27 UTC (rev 80000)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming	2013-05-07 05:36:06 UTC (rev 80001)
@@ -54,7 +54,7 @@
 # This code is still needed even thought sssd since version 1.2-2
 # update nsswitch.conf during installation, because we want to disable
 # ldap and enable sss for only some of the tables.
-cat > /etc/nsswitch.conf <<EOF
+cat > /etc/nsswitch.conf <<'EOF'
 # /etc/nsswitch.conf
 #
 # Example configuration of GNU Name Service Switch functionality.
@@ -64,12 +64,15 @@
 passwd:         files sss
 group:          files sss
 shadow:         files sss
+
 hosts:          files myhostname mdns4_minimal [NOTFOUND=return] dns mdns4
 networks:       files ldap
-protocols:      files
-services:       files
-ethers:         files
-rpc:            files
+
+protocols:      db files
+services:       db files
+ethers:         db files
+rpc:            db files
+
 netgroup:       files sss
 sudoers:        files ldap
 EOF