D16725.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D16725.diff
View Options

	Index: head/bin/csh/Makefile
	===================================================================
	--- head/bin/csh/Makefile
	+++ head/bin/csh/Makefile
	@@ -49,8 +49,7 @@

	LIBADD= termcapw crypt

	-LINKS= ${BINDIR}/csh ${BINDIR}/tcsh \
	- /root/.cshrc /.cshrc
	+LINKS= ${BINDIR}/csh ${BINDIR}/tcsh

	CLEANFILES= ${GENHDRS} gethost csh.1

	@@ -158,7 +157,7 @@
	rm -f ${DESTDIR}/.cshrc

	afterinstallconfig:
	- sed -i "" -e 's;/bin/csh;/bin/sh;' ${DESTDIR}/etc/master.passwd
	+ 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>
	Index: head/bin/sh/Makefile
	===================================================================
	--- head/bin/sh/Makefile
	+++ head/bin/sh/Makefile
	@@ -37,7 +37,6 @@

	CLEANFILES+= mknodes mksyntax
	CLEANFILES+= ${GENSRCS} ${GENHDRS}
	-LINKS= /root/.profile /.profile

	build-tools: mknodes mksyntax

	@@ -66,5 +65,8 @@

	beforeinstall:
	rm -f ${DESTDIR}/.profile
	+
	+afterinstallconfig:
	+ ${INSTALL_LINK} ${TAG_ARGS} ${DESTDIR}/root/.profile ${DESTDIR}/.profile

	.include <bsd.prog.mk>
	Index: head/etc/master.passwd
	===================================================================
	--- head/etc/master.passwd
	+++ head/etc/master.passwd
	@@ -1,6 +1,6 @@
	# $FreeBSD$
	#
	-root::0:0::0:0:Charlie &:/root:/bin/csh
	+root::0:0::0:0:Charlie &:/root:/bin/sh
	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