[26787] in Source-Commits
/svn/athena r25756 - trunk/debathena/debathena/kiosk/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Fri Sep 7 14:34:57 2012
Date: Fri, 7 Sep 2012 14:34:50 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201209071834.q87IYoAn011161@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-09-07 14:34:50 -0400 (Fri, 07 Sep 2012)
New Revision: 25756
Added:
trunk/debathena/debathena/kiosk/debian/debathena-kiosk-sudoers
Modified:
trunk/debathena/debathena/kiosk/debian/changelog
trunk/debathena/debathena/kiosk/debian/control.in
trunk/debathena/debathena/kiosk/debian/debathena-kiosk.install
trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst
Log:
In kiosk:
* Stop scribbling over sudoers and use sudoers.d (Trac: #1219)
Modified: trunk/debathena/debathena/kiosk/debian/changelog
===================================================================
--- trunk/debathena/debathena/kiosk/debian/changelog 2012-09-07 18:30:18 UTC (rev 25755)
+++ trunk/debathena/debathena/kiosk/debian/changelog 2012-09-07 18:34:50 UTC (rev 25756)
@@ -1,3 +1,9 @@
+debathena-kiosk (1.4.9) unstable; urgency=low
+
+ * Stop scribbling over sudoers and use sudoers.d (Trac: #1219)
+
+ -- Jonathan Reed <jdreed@mit.edu> Fri, 07 Sep 2012 14:33:47 -0400
+
debathena-kiosk (1.4.8) unstable; urgency=low
* Build-dep on debathena-gdm
Modified: trunk/debathena/debathena/kiosk/debian/control.in
===================================================================
--- trunk/debathena/debathena/kiosk/debian/control.in 2012-09-07 18:30:18 UTC (rev 25755)
+++ trunk/debathena/debathena/kiosk/debian/control.in 2012-09-07 18:34:50 UTC (rev 25756)
@@ -9,7 +9,7 @@
X-Debathena-Build-For: lucid natty precise
Architecture: all
Depends: ${misc:Depends}, firefox | iceweasel, metacity, unzip, adduser,
- gdm, python, python-gtk2, python-glade2, python-dbus, sun-java6-plugin | icedtea6-plugin, debathena-bugme (>= 10.0.5-0debathena1~)
+ gdm, python, python-gtk2, python-glade2, python-dbus, sun-java6-plugin | icedtea6-plugin, debathena-bugme (>= 10.0.5-0debathena1~), sudo (>= 1.7.2p1-1~)
Description: Starts a kiosk mode web browser on a new virtual terminal
This package provides a tool to launch a separate X11 session, running
a kiosk mode web browser, on a new virtual terminal. It is most useful
Added: trunk/debathena/debathena/kiosk/debian/debathena-kiosk-sudoers
===================================================================
--- trunk/debathena/debathena/kiosk/debian/debathena-kiosk-sudoers (rev 0)
+++ trunk/debathena/debathena/kiosk/debian/debathena-kiosk-sudoers 2012-09-07 18:34:50 UTC (rev 25756)
@@ -0,0 +1,4 @@
+# gdm can launch kiosk mode
+gdm ALL=NOPASSWD: /usr/lib/debathena-kiosk/launch-kiosk
+# so can lightdm
+lightdm ALL=NOPASSWD: /usr/lib/debathena-kiosk/launch-kiosk
Modified: trunk/debathena/debathena/kiosk/debian/debathena-kiosk.install
===================================================================
--- trunk/debathena/debathena/kiosk/debian/debathena-kiosk.install 2012-09-07 18:30:18 UTC (rev 25755)
+++ trunk/debathena/debathena/kiosk/debian/debathena-kiosk.install 2012-09-07 18:34:50 UTC (rev 25756)
@@ -11,3 +11,4 @@
gdm-launch-kiosk.glade usr/share/debathena-kiosk
%gconf-tree.xml usr/share/debathena-kiosk
lightdm-launch-kiosk usr/lib/debathena-kiosk
+debian/debathena-kiosk-sudoers etc/sudoers.d
Modified: trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst
===================================================================
--- trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst 2012-09-07 18:30:18 UTC (rev 25755)
+++ trunk/debathena/debathena/kiosk/debian/debathena-kiosk.postinst 2012-09-07 18:34:50 UTC (rev 25756)
@@ -25,18 +25,7 @@
if ! getent passwd $user >/dev/null; then
adduser --system --force-badname $user
fi
- # In the new gdm, the launcher is invoked as user gdm.
- gdm_version="$(dpkg-query -W -f '${Version}' gdm)"
- if dpkg --compare-versions "$gdm_version" ge '2.25.2~' &&
- [ "$(perl -e 'BEGIN { $found=0; } $found = 1 if /^### BEGIN debathena-kiosk/../^### END debathena-kiosk/; END { print $found; }' /etc/sudoers)" = "0" ]; then
- cat >>/etc/sudoers <<EOF
-### BEGIN debathena-kiosk
-# gdm can launch kiosk mode
-gdm ALL=NOPASSWD: /usr/lib/debathena-kiosk/launch-kiosk
-lightdm ALL=NOPASSWD: /usr/lib/debathena-kiosk/launch-kiosk
-### END debathena-kiosk
-EOF
- fi
+ chmod 0440 /etc/sudoers.d/debathena-kiosk-sudoers
;;
abort-upgrade|abort-remove|abort-deconfigure)
