[24188] in Source-Commits
/svn/athena r23789 - trunk/debathena/config/reactivate/debian
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Fri May 15 03:05:58 2009
Date: Fri, 15 May 2009 03:05:48 -0400
From: Geoffrey Thomas <geofft@MIT.EDU>
Message-Id: <200905150705.n4F75mMi032296@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: geofft
Date: 2009-05-15 03:05:48 -0400 (Fri, 15 May 2009)
New Revision: 23789
Added:
trunk/debathena/config/reactivate/debian/debathena-reactivate.prerm
Removed:
trunk/debathena/config/reactivate/debian/transform_sudoers.debathena
Modified:
trunk/debathena/config/reactivate/debian/control.in
trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst
trunk/debathena/config/reactivate/debian/rules
Log:
reactivate: Try a more plausible approach
Modified: trunk/debathena/config/reactivate/debian/control.in
===================================================================
--- trunk/debathena/config/reactivate/debian/control.in 2009-05-15 06:55:53 UTC (rev 23788)
+++ trunk/debathena/config/reactivate/debian/control.in 2009-05-15 07:05:48 UTC (rev 23789)
@@ -2,7 +2,7 @@
Section: debathena/net
Priority: extra
Maintainer: Debathena Project <debathena@mit.edu>
-Build-Depends: @cdbs@, sudo
+Build-Depends: @cdbs@
Standards-Version: 3.7.2
Package: debathena-reactivate
Modified: trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst 2009-05-15 06:55:53 UTC (rev 23788)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.postinst 2009-05-15 07:05:48 UTC (rev 23789)
@@ -25,6 +25,12 @@
for group in $(sed -ne 's/^addgroups="\(.*\)"/\1/p' /usr/sbin/athena-login-snapshot); do
getent group "$group" >/dev/null || addgroup --system "$group"
done
+ cat >>/etc/sudoers <<EOF
+### BEGIN debathena-reactivate
+Defaults:%admin lecture_file=/etc/athena/sudo-warning, lecture=once
+### END debathena-reactivate
+EOF
+
;;
abort-upgrade|abort-remove|abort-deconfigure)
Added: trunk/debathena/config/reactivate/debian/debathena-reactivate.prerm
===================================================================
--- trunk/debathena/config/reactivate/debian/debathena-reactivate.prerm 2009-05-15 06:55:53 UTC (rev 23788)
+++ trunk/debathena/config/reactivate/debian/debathena-reactivate.prerm 2009-05-15 07:05:48 UTC (rev 23789)
@@ -0,0 +1,41 @@
+#!/bin/sh
+# prerm script for #PACKAGE#
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+# * <prerm> `remove'
+# * <old-prerm> `upgrade' <new-version>
+# * <new-prerm> `failed-upgrade' <old-version>
+# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+# * <deconfigured's-prerm> `deconfigure' `in-favour'
+# <package-being-installed> <version> `removing'
+# <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+ remove|upgrade|deconfigure)
+ perl -i'' -ne 's%^### (BEGIN|END) debathena-reactivate\s*$%%m && ($skip = ($1 eq "BEGIN")); print unless $skip;' /etc/sudoers
+ ;;
+
+ failed-upgrade)
+ ;;
+
+ *)
+ echo "prerm called with unknown argument \`$1'" >&2
+ exit 1
+ ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
Property changes on: trunk/debathena/config/reactivate/debian/debathena-reactivate.prerm
___________________________________________________________________
Name: svn:executable
+ *
Modified: trunk/debathena/config/reactivate/debian/rules
===================================================================
--- trunk/debathena/config/reactivate/debian/rules 2009-05-15 06:55:53 UTC (rev 23788)
+++ trunk/debathena/config/reactivate/debian/rules 2009-05-15 07:05:48 UTC (rev 23789)
@@ -6,7 +6,6 @@
/etc/gdm/PreSession/Default.debathena \
/etc/gdm/PostSession/Default.debathena
DEB_TRANSFORM_FILES_debathena-reactivate += \
- /etc/sudoers.debathena \
/etc/pam.d/su.debathena
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
Deleted: trunk/debathena/config/reactivate/debian/transform_sudoers.debathena
