Commit e0de56f5 authored by Mike Hibler's avatar Mike Hibler

Update FreeBSD 5 stuff, fixup some stuff in mfs-install

parent ce48dbfd
......@@ -6,7 +6,7 @@
#
. /etc/emulab/paths.sh
echo "${interface}: ${reason}" >>$LOGDIR/dhclient-enter.log 2>&1
echo "`date`: ${interface}: ${reason}" >>$LOGDIR/dhclient-enter.log 2>&1
#
# XXX Hack to force the duplex on interfaces
......@@ -91,4 +91,4 @@ elif [ "$new_network_number" = "10.200.1.0" ]; then
setduplex $interface >>$LOGDIR/dhclient-enter.log 2>&1
fi
echo "${interface}: ${reason}: done" >>$LOGDIR/dhclient-enter.log 2>&1
echo "`date`: ${interface}: ${reason}: done" >>$LOGDIR/dhclient-enter.log 2>&1
......@@ -6,7 +6,7 @@
#
. /etc/emulab/paths.sh
echo "${interface}: ${reason}" >>$LOGDIR/dhclient-exit.log 2>&1
echo "`date`: ${interface}: ${reason}" >>$LOGDIR/dhclient-exit.log 2>&1
if [ x$reason != xREBOOT -a x$reason != xBOUND -a x$reason != xRENEW -a x$reason != xREBIND ]
then
......@@ -107,6 +107,6 @@ do
fi >>$LOGDIR/dhclient.log 2>&1
done
echo "${interface}: ${reason}: done" >>$LOGDIR/dhclient-exit.log 2>&1
echo "`date`: ${interface}: ${reason}: done" >>$LOGDIR/dhclient-exit.log 2>&1
exit 0
......@@ -50,7 +50,7 @@ destdircheck:
install client-install: basefbsd-install etc-install \
sup-install script-install bin-install # jail-install
mfs-install: destdircheck basefbsd-install etc-install \
mfs-install: destdircheck basefbsdmfs-install etc-install \
script-install bin-install
cp $(SRCDIR)/mfs-rc.conf $(SYSETCDIR)/rc.conf
$(INSTALL) -m 444 $(SRCDIR)/rc.dhclient $(SYSETCDIR)/rc.conf.d/dhclient
......@@ -99,7 +99,11 @@ dir-install:
basefbsd-install: dir-install
(cd ../freebsd; $(MAKE) all install)
rm -f $(SYSETCDIR)/start_if.*
rm -f $(SYSETCDIR)/start_if.* $(BINDIR)/dhclient
basefbsdmfs-install: dir-install
(cd ../freebsd; $(MAKE) mfs-install)
rm -f $(SYSETCDIR)/start_if.* $(BINDIR)/dhclient
basefbsdcdboot-install: dir-install
(cd ../freebsd; $(MAKE) DESTDIR=$(DESTDIR) all cdboot-install)
......
......@@ -2,22 +2,22 @@
#
root:kEi.I6fTKyJDg:0:0::0:0:Charlie &:/root:/bin/csh
toor:kEi.I6fTKyJDg:0:0::0:0:Chaplin &:/root:/bin/csh
daemon:*:1:1::0:0:Owner of many system processes:/root:/sbin/nologin
operator:*:2:5::0:0:System &:/:/sbin/nologin
bin:*:3:7::0:0:Binaries Commands and Source:/:/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/sbin/nologin
games:*:7:13::0:0:Games pseudo-user:/usr/games:/sbin/nologin
news:*:8:8::0:0:News Subsystem:/:/sbin/nologin
man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/sbin/nologin
mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/sbin/nologin
bind:*:53:53::0:0:Bind Sandbox:/:/sbin/nologin
proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/sbin/nologin
_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/sbin/nologin
uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/libexec/uucp/uucico
pop:*:68:6::0:0:Post Office Owner:/nonexistent:/sbin/nologin
daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
bin:*:3:7::0:0:Binaries Commands and Source:/:/usr/sbin/nologin
tty:*:4:65533::0:0:Tty Sandbox:/:/usr/sbin/nologin
kmem:*:5:65533::0:0:KMem Sandbox:/:/usr/sbin/nologin
games:*:7:13::0:0:Games pseudo-user:/usr/games:/usr/sbin/nologin
news:*:8:8::0:0:News Subsystem:/:/usr/sbin/nologin
man:*:9:9::0:0:Mister Man Pages:/usr/share/man:/usr/sbin/nologin
sshd:*:22:22::0:0:Secure Shell Daemon:/var/empty:/usr/sbin/nologin
smmsp:*:25:25::0:0:Sendmail Submission User:/var/spool/clientmqueue:/usr/sbin/nologin
mailnull:*:26:26::0:0:Sendmail Default User:/var/spool/mqueue:/usr/sbin/nologin
bind:*:53:53::0:0:Bind Sandbox:/:/usr/sbin/nologin
proxy:*:62:62::0:0:Packet Filter pseudo-user:/nonexistent:/usr/sbin/nologin
_pflogd:*:64:64::0:0:pflogd privsep user:/var/empty:/usr/sbin/nologin
uucp:*:66:66::0:0:UUCP pseudo-user:/var/spool/uucppublic:/usr/local/libexec/uucp/uucico
pop:*:68:6::0:0:Post Office Owner:/nonexistent:/usr/sbin/nologin
sfs:*:77:77::0:0:SFS pseudo-user:/:/bin/nologin
www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/sbin/nologin
nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/sbin/nologin
www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
#
# Bump as needed.
#
FBSD52-STD base=@CLIENT_VARDIR@ prefix=/ preserve release=20040301
FBSD54-STD base=@CLIENT_VARDIR@ prefix=/ preserve release=20040803
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment