diff options
| -rw-r--r-- | bin/csh/Makefile | 12 | ||||
| -rw-r--r-- | bin/sh/Makefile | 10 | ||||
| -rw-r--r-- | etc/Makefile | 16 | ||||
| -rw-r--r-- | etc/master.passwd | 2 | ||||
| -rw-r--r-- | etc/root/dot.cshrc (renamed from bin/csh/dot.cshrc) | 0 | ||||
| -rw-r--r-- | etc/root/dot.profile (renamed from bin/sh/dot.profile) | 0 |
6 files changed, 19 insertions, 21 deletions
diff --git a/bin/csh/Makefile b/bin/csh/Makefile index 6abf35076c48..3aaa50d4a648 100644 --- a/bin/csh/Makefile +++ b/bin/csh/Makefile @@ -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} @@ -153,11 +150,4 @@ tc.const.h: tc.const.c sh.char.h config.h config_f.h sh.types.h sh.err.h ${BUILD 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> diff --git a/bin/sh/Makefile b/bin/sh/Makefile index b50e3217e97f..652e9ddc3dbf 100644 --- a/bin/sh/Makefile +++ b/bin/sh/Makefile @@ -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 @@ -63,10 +61,4 @@ 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> diff --git a/etc/Makefile b/etc/Makefile index be034ee3d0d4..fb60669fbd40 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -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"; \ @@ -172,6 +176,18 @@ distribution: ${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" cd ${.CURDIR}/mail; ${INSTALL} -o ${BINOWN} -g ${BINGRP} -m 644 \ diff --git a/etc/master.passwd b/etc/master.passwd index 094d2da13832..a7903f08a576 100644 --- a/etc/master.passwd +++ b/etc/master.passwd @@ -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 diff --git a/bin/csh/dot.cshrc b/etc/root/dot.cshrc index 1fcc9917f0f9..1fcc9917f0f9 100644 --- a/bin/csh/dot.cshrc +++ b/etc/root/dot.cshrc diff --git a/bin/sh/dot.profile b/etc/root/dot.profile index 76ebfd5e6168..76ebfd5e6168 100644 --- a/bin/sh/dot.profile +++ b/etc/root/dot.profile |