svn commit: r337882 - in head: bin/csh bin/sh etc etc/root
Brad Davis
brd at FreeBSD.org
Wed Aug 15 23:18:36 UTC 2018
Author: brd
Date: Wed Aug 15 23:18:34 2018
New Revision: 337882
URL: https://svnweb.freebsd.org/changeset/base/337882
Log:
Revert parts of r337849 and r337857
This fixes the build and I will redo these changes as part of a future review
that organizes them differently. The way I tried to do it here could be done
better. Sorry for the noise.
Approved by: will (mentor)
Differential Revision: https://reviews.freebsd.org/D16737
Added:
head/etc/root/dot.cshrc
- copied unchanged from r337881, head/bin/csh/dot.cshrc
head/etc/root/dot.profile
- copied unchanged from r337881, head/bin/sh/dot.profile
Deleted:
head/bin/csh/dot.cshrc
head/bin/sh/dot.profile
Modified:
head/bin/csh/Makefile
head/bin/sh/Makefile
head/etc/Makefile
head/etc/master.passwd
Modified: head/bin/csh/Makefile
==============================================================================
--- head/bin/csh/Makefile Wed Aug 15 22:40:09 2018 (r337881)
+++ head/bin/csh/Makefile Wed Aug 15 23:18:34 2018 (r337882)
@@ -8,11 +8,8 @@
.include <src.opts.mk>
-CONFGROUPS= ETC ROOT
+CONFGROUPS= ETC
ETC= csh.cshrc csh.login csh.logout
-ROOT= dot.cshrc
-ROOTDIR= /root
-ROOTNAME= .cshrc
PACKAGE=runtime
TCSHDIR= ${SRCTOP}/contrib/tcsh
.PATH: ${TCSHDIR}
@@ -152,12 +149,5 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h s
sed -e 's/Char \([a-zA-Z0-9_]*\)\(.*\)/extern Char \1[];/' | \
sort >> ${.TARGET}
@echo '#endif /* _h_tc_const */' >> ${.TARGET}
-
-beforeinstall:
- rm -f ${DESTDIR}/.cshrc
-
-afterinstallconfig:
- sed -i "" -e 's;/bin/sh;/bin/csh;' ${DESTDIR}/etc/master.passwd
- pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.include <bsd.prog.mk>
Modified: head/bin/sh/Makefile
==============================================================================
--- head/bin/sh/Makefile Wed Aug 15 22:40:09 2018 (r337881)
+++ head/bin/sh/Makefile Wed Aug 15 23:18:34 2018 (r337882)
@@ -3,9 +3,7 @@
.include <src.opts.mk>
-CONFS= dot.profile profile
-CONFSDIR_dot.profile= /root
-CONFSNAME_dot.profile= .profile
+CONFS= profile
PACKAGE=runtime
PROG= sh
INSTALLFLAGS= -S
@@ -62,11 +60,5 @@ token.h: mktokens
HAS_TESTS=
SUBDIR.${MK_TESTS}+= tests
-
-beforeinstall:
- rm -f ${DESTDIR}/.profile
-
-afterinstallconfig:
- ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
.include <bsd.prog.mk>
Modified: head/etc/Makefile
==============================================================================
--- head/etc/Makefile Wed Aug 15 22:40:09 2018 (r337881)
+++ head/etc/Makefile Wed Aug 15 23:18:34 2018 (r337882)
@@ -135,6 +135,10 @@ distribution:
${DESTDIR}/etc/services;
.endif
+.if ${MK_TCSH} == "no"
+ sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
+.endif
+ pwd_mkdb -i -p -d ${DESTDIR}/etc ${DESTDIR}/etc/master.passwd
.if defined(NO_ROOT)
( \
echo "./etc/login.conf.db type=file mode=0644 uname=root gname=wheel"; \
@@ -171,6 +175,18 @@ distribution:
cd ${.CURDIR}/root; \
${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
dot.k5login ${DESTDIR}/root/.k5login;
+.endif
+ cd ${.CURDIR}/root; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ dot.profile ${DESTDIR}/root/.profile; \
+ rm -f ${DESTDIR}/.profile; \
+ ${INSTALL_LINK} ${DESTDIR}/root/.profile ${DESTDIR}/.profile
+.if ${MK_TCSH} != "no"
+ cd ${.CURDIR}/root; \
+ ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \
+ dot.cshrc ${DESTDIR}/root/.cshrc; \
+ rm -f ${DESTDIR}/.cshrc; \
+ ${INSTALL_LINK} ${DESTDIR}/root/.cshrc ${DESTDIR}/.cshrc
.endif
.if ${MK_MAIL} != "no"
Modified: head/etc/master.passwd
==============================================================================
--- head/etc/master.passwd Wed Aug 15 22:40:09 2018 (r337881)
+++ head/etc/master.passwd Wed Aug 15 23:18:34 2018 (r337882)
@@ -1,6 +1,6 @@
# $FreeBSD$
#
-root::0:0::0:0:Charlie &:/root:/bin/sh
+root::0:0::0:0:Charlie &:/root:/bin/csh
toor:*:0:0::0:0:Bourne-again Superuser:/root:
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
Copied: head/etc/root/dot.cshrc (from r337881, head/bin/csh/dot.cshrc)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/root/dot.cshrc Wed Aug 15 23:18:34 2018 (r337882, copy of r337881, head/bin/csh/dot.cshrc)
@@ -0,0 +1,43 @@
+# $FreeBSD$
+#
+# .cshrc - csh resource script, read at beginning of execution by each shell
+#
+# see also csh(1), environ(7).
+# more examples available at /usr/share/examples/csh/
+#
+
+alias h history 25
+alias j jobs -l
+alias la ls -aF
+alias lf ls -FA
+alias ll ls -lAF
+
+# A righteous umask
+umask 22
+
+set path = (/sbin /bin /usr/sbin /usr/bin /usr/local/sbin /usr/local/bin $HOME/bin)
+
+setenv EDITOR vi
+setenv PAGER less
+setenv BLOCKSIZE K
+
+if ($?prompt) then
+ # An interactive shell -- set some stuff up
+ set prompt = "%N@%m:%~ %# "
+ set promptchars = "%#"
+
+ set filec
+ set history = 1000
+ set savehist = (1000 merge)
+ set autolist = ambiguous
+ # Use history to aid expansion
+ set autoexpand
+ set autorehash
+ set mail = (/var/mail/$USER)
+ if ( $?tcsh ) then
+ bindkey "^W" backward-delete-word
+ bindkey -k up history-search-backward
+ bindkey -k down history-search-forward
+ endif
+
+endif
Copied: head/etc/root/dot.profile (from r337881, head/bin/sh/dot.profile)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/etc/root/dot.profile Wed Aug 15 23:18:34 2018 (r337882, copy of r337881, head/bin/sh/dot.profile)
@@ -0,0 +1,16 @@
+# $FreeBSD$
+#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
+export PATH
+HOME=/root
+export HOME
+TERM=${TERM:-xterm}
+export TERM
+PAGER=less
+export PAGER
+
+# Query terminal size; useful for serial lines.
+if [ -x /usr/bin/resizewin ] ; then /usr/bin/resizewin -z ; fi
+
+# Uncomment to display a random cookie on each login.
+# if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi
More information about the svn-src-head
mailing list