[debian-edu-commits] r82344 - branches/wheezy/debian-edu-config/debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-09-13 06:05:28 +0000 (Fri, 13 Sep 2013)
New Revision: 82344

Modified:
   branches/wheezy/debian-edu-config/debian/changelog
   branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst
Log:
Make sure to fix permission of /var/opt/ltsp/swapfiles on upgrades
too.

Modified: branches/wheezy/debian-edu-config/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-config/debian/changelog	2013-09-12 10:20:04 UTC (rev 82343)
+++ branches/wheezy/debian-edu-config/debian/changelog	2013-09-13 06:05:28 UTC (rev 82344)
@@ -1,5 +1,6 @@
 debian-edu-config (1.716~svn82XXX) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * Fix nbd server setup:
     - cf/cf.ltsp: Adjust swapfile directory ownership to user and group
       nbd.
@@ -10,6 +11,10 @@
   * Remove filesize statement from nbd-server/conf.d/debian-edu.conf,
     cause the default LTSP swap file size (512MB) should be kept.
 
+  [ Petter Reinholdtsen ]
+  * Make sure to fix permission of /var/opt/ltsp/swapfiles on upgrades
+    too.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Tue, 03 Sep 2013 11:49:01 +0200
 
 debian-edu-config (1.715) unstable; urgency=low

Modified: branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst
===================================================================
--- branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst	2013-09-12 10:20:04 UTC (rev 82343)
+++ branches/wheezy/debian-edu-config/debian/debian-edu-config.postinst	2013-09-13 06:05:28 UTC (rev 82344)
@@ -277,6 +277,14 @@
         disable_iceweasel_homepage_divert
     fi
 
+    if dpkg --compare-versions "$2" le "1.715"; then
+	swapfiles=/var/opt/ltsp/swapfiles
+	if [ -d $swapfiles ] ; then
+	    chmod 700 $swapfiles
+	    chown nbd:nbd $swapfiles
+	fi
+    fi
+
     # sssd refuses to read the file if it has any other mode
     chmod 600 /etc/sssd/sssd-debian-edu.conf
     chown root:root /etc/sssd/sssd-debian-edu.conf