[23961] in Source-Commits
/svn/athena r23571 - trunk/debathena/config/linerva/debian
daemon@ATHENA.MIT.EDU (Gregory Nathan Price)
Sat Mar 7 16:30:19 2009
Date: Sat, 7 Mar 2009 16:30:12 -0500
From: Gregory Nathan Price <price@MIT.EDU>
Message-Id: <200903072130.n27LUC6h013694@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: price
Date: 2009-03-07 16:30:12 -0500 (Sat, 07 Mar 2009)
New Revision: 23571
Modified:
trunk/debathena/config/linerva/debian/changelog
trunk/debathena/config/linerva/debian/debathena-linerva.init
trunk/debathena/config/linerva/debian/debathena-linerva.postinst
trunk/debathena/config/linerva/debian/rules
Log:
In linerva:
* Don't fail in the logcheck git checkout if previously attempted.
* chmod /var/run/screen in the initscript, not the postinst.
* Make the initscript run early.
Modified: trunk/debathena/config/linerva/debian/changelog
===================================================================
--- trunk/debathena/config/linerva/debian/changelog 2009-03-07 20:13:41 UTC (rev 23570)
+++ trunk/debathena/config/linerva/debian/changelog 2009-03-07 21:30:12 UTC (rev 23571)
@@ -1,3 +1,11 @@
+debathena-linerva (1.23) unstable; urgency=low
+
+ * Don't fail in the logcheck git checkout if previously attempted.
+ * chmod /var/run/screen in the initscript, not the postinst.
+ * Make the initscript run early.
+
+ -- Greg Price <price@mit.edu> Sat, 07 Mar 2009 16:26:41 -0500
+
debathena-linerva (1.22) unstable; urgency=low
* traceroute.db doesn't expect suid, so let's use that, and not keep the
Modified: trunk/debathena/config/linerva/debian/debathena-linerva.init
===================================================================
--- trunk/debathena/config/linerva/debian/debathena-linerva.init 2009-03-07 20:13:41 UTC (rev 23570)
+++ trunk/debathena/config/linerva/debian/debathena-linerva.init 2009-03-07 21:30:12 UTC (rev 23571)
@@ -38,6 +38,8 @@
mkdir /tmp/uscreens
chown root:utmp /tmp/uscreens
chmod a=rwx,o+t /tmp/uscreens
+
+ chmod a=rwx,o+t /var/run/screen # So that screen works without setuid.
}
case "$1" in
Modified: trunk/debathena/config/linerva/debian/debathena-linerva.postinst
===================================================================
--- trunk/debathena/config/linerva/debian/debathena-linerva.postinst 2009-03-07 20:13:41 UTC (rev 23570)
+++ trunk/debathena/config/linerva/debian/debathena-linerva.postinst 2009-03-07 21:30:12 UTC (rev 23571)
@@ -34,7 +34,7 @@
chown logcheck /var/lib/logcheck/
chown logcheck /var/lock/logcheck/
if [ ! -e /etc/logcheck/.git ]; then
- mv /etc/logcheck /etc/logcheck.orig
+ mv /etc/logcheck /etc/logcheck.orig || true
fi
if [ ! -e /etc/logcheck ]; then
kinit -k
@@ -44,8 +44,6 @@
chmod 750 /etc/logcheck
chmod 750 /etc/logcheck.orig
- chmod a=rwx,o+t /var/run/screen # So that screen works without setuid.
-
linerva-clean-setugid --clean
if hash invoke-rc.d; then
Modified: trunk/debathena/config/linerva/debian/rules
===================================================================
--- trunk/debathena/config/linerva/debian/rules 2009-03-07 20:13:41 UTC (rev 23570)
+++ trunk/debathena/config/linerva/debian/rules 2009-03-07 21:30:12 UTC (rev 23571)
@@ -14,5 +14,8 @@
/etc/rsyslog.conf.debathena \
/etc/cron.d/logcheck.debathena
+#Needs to go before S70screen-cleanup (and before users log in and run screen.)
+DEB_UPDATE_RCD_PARAMS_debathena-linerva = "start 65 S ."
+
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/rules/config-package.mk
