Date: Fri, 26 Jan 2001 22:08:20 +0100 From: "Steve O'Hara-Smith" <steveo@eircom.net> To: current@freebsd.org Subject: patch for test: /etc/shells -> /usr/local/etc/shells Message-ID: <20010126220820.2fa3265a.steveo@eircom.net>
next in thread | raw e-mail | index | archive | help
Hi,
Following some recent comments on the evil ways of ports have of
writing in /etc on install -
The patch below (against 4-stable but it will probably apply easily
to -current) moves /etc/shells to /usr/local/etc/shells. It should include
the removal of /usr/src/etc/shells but "cvs diff -N -u ..." did not do what
I exepected :(
After installworld you will have to move /etc/shells to /usr/local/etc
by hand or only the default shells will be known.
To follow (if this is not flamed to death), bsd.ports.mk patch to
automate maintenance of /usr/local/etc/shells during port install, and (of
course) documentation patches (I have a grep).
I am running on this and it works as expected with and without
/usr/local/etc/shells installed and with /etc/shells removed. It needs
more hammering than I can give it to be sure it is safe in all conditions
hence this mail.
Index: include/paths.h
===================================================================
RCS file: /home/ncvs/src/include/paths.h,v
retrieving revision 1.9.6.1
diff -u -r1.9.6.1 paths.h
--- include/paths.h 2000/12/11 01:03:16 1.9.6.1
+++ include/paths.h 2001/01/26 07:00:24
@@ -60,7 +60,7 @@
#define _PATH_MEM "/dev/mem"
#define _PATH_NOLOGIN "/var/run/nologin"
#define _PATH_SENDMAIL "/usr/sbin/sendmail"
-#define _PATH_SHELLS "/etc/shells"
+#define _PATH_SHELLS "/usr/local/etc/shells"
#define _PATH_TTY "/dev/tty"
#define _PATH_UNIX "don't use _PATH_UNIX"
#define _PATH_VI "/usr/bin/vi"
Index: etc/Makefile
===================================================================
RCS file: /home/ncvs/src/etc/Makefile,v
retrieving revision 1.219.2.9
diff -u -r1.219.2.9 Makefile
--- etc/Makefile 2000/11/01 07:21:45 1.219.2.9
+++ etc/Makefile 2001/01/26 07:04:28
@@ -13,7 +13,7 @@
printcap profile protocols \
rc rc.atm rc.devfs rc.diskless1 rc.diskless2 rc.firewall rc.firewall6 \
rc.isdn rc.network rc.network6 rc.pccard rc.serial rc.shutdown \
- rc.sysctl remote rpc security services shells syslog.conf usbd.conf \
+ rc.sysctl remote rpc security services syslog.conf usbd.conf \
etc.${MACHINE_ARCH}/disktab \
etc.${MACHINE_ARCH}/rc.${MACHINE_ARCH} \
etc.${MACHINE_ARCH}/ttys \
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-current" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20010126220820.2fa3265a.steveo>