[25422] in Source-Commits
Re: /svn/athena r24970 -
daemon@ATHENA.MIT.EDU (Geoffrey Thomas)
Mon Feb 21 17:54:43 2011
Date: Mon, 21 Feb 2011 17:54:36 -0500 (EST)
From: Geoffrey Thomas <geofft@MIT.EDU>
To: Anders Kaseorg <andersk@mit.edu>
cc: source-commits@mit.edu
In-Reply-To: <201102210109.p1L19FD0002548@drugstore.mit.edu>
Message-ID: <alpine.DEB.1.10.1102211754130.32611@lunatique.mit.edu>
MIME-Version: 1.0
Content-Type: MULTIPART/MIXED; BOUNDARY="-804087552-175255356-1298328876=:32611"
This message is in MIME format. The first part should be readable text,
while the remaining parts are likely unreadable without MIME-aware tools.
---804087552-175255356-1298328876=:32611
Content-Type: TEXT/PLAIN; charset=UTF-8; format=flowed
Content-Transfer-Encoding: QUOTED-PRINTABLE
Tested the bash and tcsh variants on my Athena accounts (the bash one more=
=20
thoroughly). ACK.
--=20
Geoffrey Thomas
geofft@mit.edu
On Sun, 20 Feb 2011, Anders Kaseorg wrote:
> 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-i=
nit
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/config/shell-config/debian/01-debathena-shell-init=09=
2011-02-19 23:15:56 UTC (rev 24969)
> +++ trunk/debathena/config/shell-config/debian/01-debathena-shell-init=09=
2011-02-21 01:09:15 UTC (rev 24970)
> @@ -14,9 +14,15 @@
> kinit -4 </dev/null &>/dev/null
> [ $? !=3D 3 ] && KINIT_ARGS=3D"-54"
> kinit $KINIT_ARGS "${principal:-$ATHENA_USER}" || return $?
> - DEBATHENA_AKLOG=3D"aklog -c athena.mit.edu -p $HOME"
> - [ -x /bin/fsid ] && DEBATHENA_AKLOG=3D"fsid -a"
> - [ -e /afs/athena.mit.edu ] && $DEBATHENA_AKLOG || {
> + [ -e /afs/athena.mit.edu ] && {
> +=09if [ "$DEBATHENA_HOME_TYPE" =3D afs ]; then
> +=09 if [ -x /bin/fsid ]; then
> +=09=09fsid -a
> +=09 else
> +=09=09aklog -p "$HOME"
> +=09 fi
> +=09fi
> + } && aklog || {
> =09ret=3D$?
> =09echo >&2
> =09echo "Your AFS client does not seem to be working. To troubleshoot th=
is problem," >&2
>
> Modified: trunk/debathena/config/shell-config/debian/changelog
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/config/shell-config/debian/changelog=092011-02-19 23:=
15:56 UTC (rev 24969)
> +++ trunk/debathena/config/shell-config/debian/changelog=092011-02-21 01:=
09:15 UTC (rev 24970)
> @@ -1,3 +1,11 @@
> +debathena-shell-config (1.15) unstable; urgency=3Dlow
> +
> + * Restore the previous functionality of renew for local users (broken =
in
> + 1.13), by running a plain =E2=80=98aklog=E2=80=99 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=3Dlow
>
> * Avoid multi-line aliases in tcsh, because they play poorly with
>
> Modified: trunk/debathena/config/shell-config/debian/cshrc.debathena
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- trunk/debathena/config/shell-config/debian/cshrc.debathena=092011-02-=
19 23:15:56 UTC (rev 24969)
> +++ trunk/debathena/config/shell-config/debian/cshrc.debathena=092011-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" =3D=3D afs ) then
> +=09if ( -x "/bin/fsid" ) then
> +=09 alias debathena_fsid 'fsid -a'
> +=09else
> +=09 alias debathena_fsid 'aklog -p "$HOME"'
> +=09endif
> + endif
> endif
>
> -alias renew 'set KINIT_ARGS=3D""; kinit -4 </dev/null >& /dev/null; if (=
$? !=3D 3) set KINIT_ARGS=3D"-45"; kinit $KINIT_ARGS "$ATHENA_USER" && $DEB=
ATHENA_AKLOG'
> +alias renew 'set KINIT_ARGS=3D""; kinit -4 </dev/null >& /dev/null; if (=
$? !=3D 3) set KINIT_ARGS=3D"-45"; kinit $KINIT_ARGS "$ATHENA_USER" && deba=
thena_fsid && aklog'
>
> set add_flags
> alias add 'eval `/bin/attach -Padd $add_flags \!:*`'
>
>
---804087552-175255356-1298328876=:32611--
