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

[pere at alioth.debian.org]

Author: pere
Date: 2013-06-13 13:46:32 +0000 (Thu, 13 Jun 2013)
New Revision: 80574

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming
Log:
Avoid hardcoded path in setup-roaming, to make it easier to move.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 13:13:15 UTC (rev 80573)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-06-13 13:46:32 UTC (rev 80574)
@@ -1,3 +1,10 @@
+debian-edu-config (1.707~svn80574) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Avoid hardcoded path in setup-roaming, to make it easier to move.
+
+ -- Petter Reinholdtsen <pere at debian.org>  Thu, 13 Jun 2013 15:46:11 +0200
+
 debian-edu-config (1.707~svn80573) wheezy-test; urgency=low
 
   [ Holger Levsen ]

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-06-13 13:13:15 UTC (rev 80573)
+++ branches/wheezy/debian-edu-config/share/debian-edu-config/tools/setup-roaming	2013-06-13 13:46:32 UTC (rev 80574)
@@ -4,6 +4,8 @@
 
 set -e
 
+bindir=$(dirname $0)
+
 append_if_missing() {
     file="$1"
     string="$2"
@@ -35,7 +37,7 @@
 
 # configure sssd
 rm -f /etc/sssd/sssd.conf
-/usr/share/debian-edu-config/tools/sssd-generate-config > /etc/sssd/sssd.conf
+$bindir/sssd-generate-config > /etc/sssd/sssd.conf
 if [ -s /etc/sssd/sssd.conf ] ; then
     chmod 600 /etc/sssd/sssd.conf
     chown root:root /etc/sssd/sssd.conf