[25421] in Source-Commits
/svn/athena r24970 - trunk/debathena/config/shell-config/debian
daemon@ATHENA.MIT.EDU (Anders Kaseorg)
Sun Feb 20 20:09:22 2011
Date: Sun, 20 Feb 2011 20:09:15 -0500
From: Anders Kaseorg <andersk@MIT.EDU>
Message-Id: <201102210109.p1L19FD0002548@drugstore.mit.edu>
To: source-commits@mit.edu
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: andersk
Date: 2011-02-20 20:09:15 -0500 (Sun, 20 Feb 2011)
New Revision: 24970
Modified:
trunk/debathena/config/shell-config/debian/01-debathena-shell-init
trunk/debathena/config/shell-config/debian/changelog
trunk/debathena/config/shell-config/debian/cshrc.debathena
Log:
Modified: trunk/debathena/config/shell-config/debian/01-debathena-shell-init
===================================================================
--- trunk/debathena/config/shell-config/debian/01-debathena-shell-init 2011-02-19 23:15:56 UTC (rev 24969)
+++ trunk/debathena/config/shell-config/debian/01-debathena-shell-init 2011-02-21 01:09:15 UTC (rev 24970)
@@ -14,9 +14,15 @@
kinit -4 </dev/null &>/dev/null
[ $? != 3 ] && KINIT_ARGS="-54"
kinit $KINIT_ARGS "${principal:-$ATHENA_USER}" || return $?
- DEBATHENA_AKLOG="aklog -c athena.mit.edu -p $HOME"
- [ -x /bin/fsid ] && DEBATHENA_AKLOG="fsid -a"
- [ -e /afs/athena.mit.edu ] && $DEBATHENA_AKLOG || {
+ [ -e /afs/athena.mit.edu ] && {
+ if [ "$DEBATHENA_HOME_TYPE" = afs ]; then
+ if [ -x /bin/fsid ]; then
+ fsid -a
+ else
+ aklog -p "$HOME"
+ fi
+ fi
+ } && aklog || {
ret=$?
echo >&2
echo "Your AFS client does not seem to be working. To troubleshoot this problem," >&2
Modified: trunk/debathena/config/shell-config/debian/changelog
===================================================================
--- trunk/debathena/config/shell-config/debian/changelog 2011-02-19 23:15:56 UTC (rev 24969)
+++ trunk/debathena/config/shell-config/debian/changelog 2011-02-21 01:09:15 UTC (rev 24970)
@@ -1,3 +1,11 @@
+debathena-shell-config (1.15) unstable; urgency=low
+
+ * Restore the previous functionality of renew for local users (broken in
+ 1.13), by running a plain ‘aklog’ too.
+ * Fix $HOME quoting problems in renew.
+
+ -- Anders Kaseorg <andersk@mit.edu> Sun, 20 Feb 2011 20:03:53 -0500
+
debathena-shell-config (1.14) unstable; urgency=low
* Avoid multi-line aliases in tcsh, because they play poorly with
Modified: trunk/debathena/config/shell-config/debian/cshrc.debathena
===================================================================
--- trunk/debathena/config/shell-config/debian/cshrc.debathena 2011-02-19 23:15:56 UTC (rev 24969)
+++ trunk/debathena/config/shell-config/debian/cshrc.debathena 2011-02-21 01:09:15 UTC (rev 24970)
@@ -7,12 +7,18 @@
setenv ATHENA_SYS @sys
endif
setenv ATHENA_SYS_COMPAT `/bin/machtype -C`
-setenv DEBATHENA_AKLOG "aklog -c athena.mit.edu -p $HOME"
-if ( -x "/bin/fsid" ) then
- setenv DEBATHENA_AKLOG "fsid -a"
+alias debathena_fsid true
+if ( $?DEBATHENA_HOME_TYPE ) then
+ if ( "$DEBATHENA_HOME_TYPE" == afs ) then
+ if ( -x "/bin/fsid" ) then
+ alias debathena_fsid 'fsid -a'
+ else
+ alias debathena_fsid 'aklog -p "$HOME"'
+ endif
+ endif
endif
-alias renew 'set KINIT_ARGS=""; kinit -4 </dev/null >& /dev/null; if ($? != 3) set KINIT_ARGS="-45"; kinit $KINIT_ARGS "$ATHENA_USER" && $DEBATHENA_AKLOG'
+alias renew 'set KINIT_ARGS=""; kinit -4 </dev/null >& /dev/null; if ($? != 3) set KINIT_ARGS="-45"; kinit $KINIT_ARGS "$ATHENA_USER" && debathena_fsid && aklog'
set add_flags
alias add 'eval `/bin/attach -Padd $add_flags \!:*`'
