On Sun, Mar 20, 2016 at 01:33:06AM +0100, Alexander Hall wrote:
> Hi,
>
> As far as I can tell, there is no point in having these files lying
> around in /etc as they are not needed by tcsh. They're all comments
> and don't even hold an example.
>
> Thus, remove them and make them optional in /etc/mtree/special.
>
> Objections from tcsh users?
s/tcsh/csh/g, also in subject, as pointed out to me off-list. I did get
a strange feeling typing all those "tcsh"s.
/Alexander
>
> OK?
>
> /Alexander
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/src/etc/Makefile,v
> retrieving revision 1.421
> diff -u -p -r1.421 Makefile
> --- Makefile 9 Mar 2016 16:28:46 -0000 1.421
> +++ Makefile 20 Mar 2016 00:21:11 -0000
> @@ -30,9 +30,8 @@ kernels: bootblocks ${ALL_KERNELS}
> # -rw-r--r--
> BINOWN= root
> BINGRP= wheel
> -MUTABLE=changelist csh.cshrc csh.login csh.logout daily \
> - etc.${MACHINE}/disktab etc.${MACHINE}/login.conf ftpusers \
> - gettytab group ksh.kshrc locate.rc mailer.conf \
> +MUTABLE=changelist daily etc.${MACHINE}/disktab etc.${MACHINE}/login.conf \
> + ftpusers gettytab group ksh.kshrc locate.rc mailer.conf \
> moduli monthly netstart networks newsyslog.conf ntpd.conf \
> pf.os protocols rc rc.conf rpc services shells syslog.conf weekly
>
> Index: csh.cshrc
> ===================================================================
> RCS file: /cvs/src/etc/csh.cshrc,v
> retrieving revision 1.2
> diff -u -p -r1.2 csh.cshrc
> --- csh.cshrc 26 May 1996 10:25:19 -0000 1.2
> +++ csh.cshrc 20 Mar 2016 00:21:11 -0000
> @@ -1,3 +0,0 @@
> -# $OpenBSD: csh.cshrc,v 1.2 1996/05/26 10:25:19 deraadt Exp $
> -#
> -# System-wide .cshrc file for csh(1).
> Index: csh.login
> ===================================================================
> RCS file: /cvs/src/etc/csh.login,v
> retrieving revision 1.2
> diff -u -p -r1.2 csh.login
> --- csh.login 26 May 1996 10:25:19 -0000 1.2
> +++ csh.login 20 Mar 2016 00:21:11 -0000
> @@ -1,3 +0,0 @@
> -# $OpenBSD: csh.login,v 1.2 1996/05/26 10:25:19 deraadt Exp $
> -#
> -# System-wide .login file for csh(1).
> Index: csh.logout
> ===================================================================
> RCS file: /cvs/src/etc/csh.logout,v
> retrieving revision 1.2
> diff -u -p -r1.2 csh.logout
> --- csh.logout 26 May 1996 10:25:20 -0000 1.2
> +++ csh.logout 20 Mar 2016 00:21:11 -0000
> @@ -1,3 +0,0 @@
> -# $OpenBSD: csh.logout,v 1.2 1996/05/26 10:25:20 deraadt Exp $
> -#
> -# System-wide .logout file for csh(1).
> Index: mtree/special
> ===================================================================
> RCS file: /cvs/src/etc/mtree/special,v
> retrieving revision 1.117
> diff -u -p -r1.117 special
> --- mtree/special 8 Mar 2016 00:16:47 -0000 1.117
> +++ mtree/special 20 Mar 2016 00:21:11 -0000
> @@ -16,9 +16,9 @@ etc type=dir mode=0755 uname=root gname
> bgpd.conf type=file mode=0600 uname=root gname=wheel optional
> chio.conf type=file mode=0644 uname=root gname=operator optional
> crontab type=file mode=0600 uname=root gname=wheel optional
> -csh.cshrc type=file mode=0644 uname=root gname=wheel
> -csh.login type=file mode=0644 uname=root gname=wheel
> -csh.logout type=file mode=0644 uname=root gname=wheel
> +csh.cshrc type=file mode=0644 uname=root gname=wheel optional
> +csh.login type=file mode=0644 uname=root gname=wheel optional
> +csh.logout type=file mode=0644 uname=root gname=wheel optional
> daily type=file mode=0644 uname=root gname=wheel
> daily.local type=file mode=0644 uname=root gname=wheel optional
> dhcpd.conf type=file mode=0644 uname=root gname=wheel optional
>
