Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/netbsd-1-5]: src/etc/rc.d pull up the following
details: https://anonhg.NetBSD.org/src/rev/40e779c60d31
branches: netbsd-1-5
changeset: 489006:40e779c60d31
user: lukem <lukem%NetBSD.org@localhost>
date: Wed Aug 09 19:09:37 2000 +0000
description:
pull up the following
approved by: thorpej
etc/rc.d/DAEMON 1.3
etc/rc.d/LOGIN 1.3
etc/rc.d/NETWORK 1.1
etc/rc.d/SERVERS 1.2
etc/rc.d/cron 1.4
etc/rc.d/dhclient 1.6
etc/rc.d/dmesg 1.4
etc/rc.d/inetd 1.5
etc/rc.d/lkm1 1.3
etc/rc.d/lkm2 1.3
etc/rc.d/lkm3 1.4
etc/rc.d/motd 1.3
etc/rc.d/mountcritlocal 1.3-1.4
etc/rc.d/mountcritremote 1.3
etc/rc.d/mountd 1.7
etc/rc.d/network 1.12 1.14
etc/rc.d/ntpdate 1.4
etc/rc.d/ppp 1.3-1.4
etc/rc.d/pwcheck 1.3
etc/rc.d/rpcbind 1.4
etc/rc.d/sshd 1.3-1.5
etc/rc.d/swap1 1.5
etc/rc.d/swap2 1.4
etc/rc.d/sysdb 1.3-1.4
etc/rc.d/syslogd 1.5-1.6
etc/rc.d/systemfs REMOVE
etc/rc.d/virecover 1.3
etc/rc.d/wscons 1.4
etc/rc.d/xdm 1.5
summary:
* reword descriptions
* add '# KEYWORD: shutdown' to some of these scripts so that only they get run
at shutdown time. now, only scripts with the keyword `shutdown' will be
run by /etc/rc.shutdown, which speeds up shutdown and makes it more robust
* add new dummy dependancy `NETWORK' to be REQUIREd by services which need
networking to be operational before starting, and use as appropriate.
NETWORK depends upon network and dhclient.
* move the guts of systemfs into mountcritlocal
* replace the dependancy on systemfs with mountcritremote, and remove the
former.
* SERVERS now also depends upon ppp
* move recreating /var/run/utmp from mountcritlocal (where /var/run is
purged but /usr/bin/install is not available) to sysdb.
problem noted by Matthias Drochner.
* share the same load_rc_config between the lkm* scripts
* network: Don't warn that $hostname isn't set if the hostname is already set.
* network: reenable stop_cmd now that network doesn't get run at shutdown
* add sshd startup script
* use "load_rc_config swap" for swap1 and swap2
* syslog requires databases from sysdb which creates /var/run/utmp.
Should fix PRs:
[install/9853] [bin/10002] [misc/10349] [port-i386/10633] [misc/10641]
diffstat:
etc/rc.d/DAEMON | 6 +++---
etc/rc.d/LOGIN | 11 ++++++-----
etc/rc.d/NETWORK | 10 ++++++++++
etc/rc.d/SERVERS | 4 ++--
etc/rc.d/cron | 3 ++-
etc/rc.d/dhclient | 8 ++++++--
etc/rc.d/dmesg | 4 ++--
etc/rc.d/inetd | 3 ++-
etc/rc.d/lkm1 | 4 ++--
etc/rc.d/lkm2 | 4 ++--
etc/rc.d/lkm3 | 4 ++--
etc/rc.d/motd | 4 ++--
etc/rc.d/mountcritlocal | 18 ++++++++++++++++--
etc/rc.d/mountcritremote | 7 +++++--
etc/rc.d/mountd | 4 ++--
etc/rc.d/network | 6 +++---
etc/rc.d/ntpdate | 4 ++--
etc/rc.d/ppp | 13 +++++++------
etc/rc.d/pwcheck | 4 ++--
etc/rc.d/rpcbind | 4 ++--
etc/rc.d/sshd | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
etc/rc.d/swap1 | 4 ++--
etc/rc.d/swap2 | 4 ++--
etc/rc.d/sysdb | 10 ++++++++--
etc/rc.d/syslogd | 4 ++--
etc/rc.d/systemfs | 27 ---------------------------
etc/rc.d/virecover | 4 ++--
etc/rc.d/wscons | 4 ++--
etc/rc.d/xdm | 3 ++-
29 files changed, 148 insertions(+), 85 deletions(-)
diffs (truncated from 605 to 300 lines):
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/DAEMON
--- a/etc/rc.d/DAEMON Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/DAEMON Wed Aug 09 19:09:37 2000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: DAEMON,v 1.2 2000/06/13 16:29:54 itojun Exp $
+# $NetBSD: DAEMON,v 1.2.2.1 2000/08/09 19:09:37 lukem Exp $
#
# PROVIDE: DAEMON
@@ -8,5 +8,5 @@
# REQUIRE: ipnat ipmon savecore pwcheck quota databases network dmesg
# REQUIRE: aftermountlkm nfslocking ipsec
-# This is a dummy dependancy, to ensure that daemons are run
-# _after_ the above are.
+# This is a dummy dependancy, to ensure that general purpose daemons
+# are run _after_ the above are.
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/LOGIN
--- a/etc/rc.d/LOGIN Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/LOGIN Wed Aug 09 19:09:37 2000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: LOGIN,v 1.2 2000/05/02 16:31:11 augustss Exp $
+# $NetBSD: LOGIN,v 1.2.4.1 2000/08/09 19:09:37 lukem Exp $
#
# PROVIDE: LOGIN
@@ -9,7 +9,8 @@
# REQUIRE: route6d rtadvd rtsold wscons yppasswdd
-# This is a dummy to ensure that xdm, inetd, cron and kerberos are
-# started after everything else, incase the user has increased the
-# system security level, and because we want to delay user logins
-# until the system is (almost) fully operational.
+# This is a dummy dependancy to ensure user services such as xdm,
+# inetd, cron and kerberos are started after everything else, incase
+# the administrator has increased the system security level and
+# wants to delay user logins until the system is (almost) fully
+# operational.
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/NETWORK
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/etc/rc.d/NETWORK Wed Aug 09 19:09:37 2000 +0000
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# $NetBSD: NETWORK,v 1.1.2.2 2000/08/09 19:09:38 lukem Exp $
+#
+
+# PROVIDE: NETWORK
+# REQUIRE: network dhclient
+
+# This is a dummy dependancy, for services which require networking
+# to be operational before starting.
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/SERVERS
--- a/etc/rc.d/SERVERS Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/SERVERS Wed Aug 09 19:09:37 2000 +0000
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: SERVERS,v 1.1.4.1 2000/08/06 21:39:04 thorpej Exp $
+# $NetBSD: SERVERS,v 1.1.4.2 2000/08/09 19:09:38 lukem Exp $
#
# PROVIDE: SERVERS
-# REQUIRE: ipmon savecore syslogd kdc
+# REQUIRE: ipmon ppp savecore syslogd kdc
# This is a dummy dependancy, for early-start servers relying on
# some basic configuration.
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/cron
--- a/etc/rc.d/cron Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/cron Wed Aug 09 19:09:37 2000 +0000
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $NetBSD: cron,v 1.3 2000/05/13 08:45:06 lukem Exp $
+# $NetBSD: cron,v 1.3.4.1 2000/08/09 19:09:39 lukem Exp $
#
# PROVIDE: cron
# REQUIRE: LOGIN
+# KEYWORD: shutdown
. /etc/rc.subr
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/dhclient
--- a/etc/rc.d/dhclient Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/dhclient Wed Aug 09 19:09:37 2000 +0000
@@ -1,10 +1,14 @@
#!/bin/sh
#
-# $NetBSD: dhclient,v 1.5 2000/05/26 20:44:17 hubertf Exp $
+# $NetBSD: dhclient,v 1.5.4.1 2000/08/09 19:09:39 lukem Exp $
#
# PROVIDE: dhclient
-# REQUIRE: systemfs syslogd
+# REQUIRE: network mountcritlocal
+#
+# Note that there no syslog logging of dhclient messages at boot because
+# dhclient needs to start before services that syslog depends upon do.
+#
. /etc/rc.subr
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/dmesg
--- a/etc/rc.d/dmesg Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/dmesg Wed Aug 09 19:09:37 2000 +0000
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: dmesg,v 1.3 2000/05/13 08:45:06 lukem Exp $
+# $NetBSD: dmesg,v 1.3.4.1 2000/08/09 19:09:39 lukem Exp $
#
# PROVIDE: dmesg
-# REQUIRE: systemfs
+# REQUIRE: mountcritremote
. /etc/rc.subr
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/inetd
--- a/etc/rc.d/inetd Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/inetd Wed Aug 09 19:09:37 2000 +0000
@@ -1,10 +1,11 @@
#!/bin/sh
#
-# $NetBSD: inetd,v 1.4 2000/05/13 08:45:06 lukem Exp $
+# $NetBSD: inetd,v 1.4.4.1 2000/08/09 19:09:40 lukem Exp $
#
# PROVIDE: inetd
# REQUIRE: DAEMON LOGIN
+# KEYWORD: shutdown
. /etc/rc.subr
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/lkm1
--- a/etc/rc.d/lkm1 Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/lkm1 Wed Aug 09 19:09:37 2000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: lkm1,v 1.2 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: lkm1,v 1.2.4.1 2000/08/09 19:09:40 lukem Exp $
#
# PROVIDE: beforenetlkm
@@ -34,5 +34,5 @@
fi
}
-load_rc_config $name
+load_rc_config lkm
run_rc_command "$1"
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/lkm2
--- a/etc/rc.d/lkm2 Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/lkm2 Wed Aug 09 19:09:37 2000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: lkm2,v 1.2 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: lkm2,v 1.2.4.1 2000/08/09 19:09:41 lukem Exp $
#
# PROVIDE: beforemountlkm
@@ -34,5 +34,5 @@
fi
}
-load_rc_config $name
+load_rc_config lkm
run_rc_command "$1"
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/lkm3
--- a/etc/rc.d/lkm3 Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/lkm3 Wed Aug 09 19:09:37 2000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: lkm3,v 1.3 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: lkm3,v 1.3.4.1 2000/08/09 19:09:41 lukem Exp $
#
# PROVIDE: aftermountlkm
@@ -24,5 +24,5 @@
fi
}
-load_rc_config $name
+load_rc_config lkm
run_rc_command "$1"
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/motd
--- a/etc/rc.d/motd Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/motd Wed Aug 09 19:09:37 2000 +0000
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: motd,v 1.2.4.1 2000/08/01 13:42:25 chuck Exp $
+# $NetBSD: motd,v 1.2.4.2 2000/08/09 19:09:41 lukem Exp $
#
# PROVIDE: motd
-# REQUIRE: systemfs
+# REQUIRE: mountcritremote
. /etc/rc.subr
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/mountcritlocal
--- a/etc/rc.d/mountcritlocal Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/mountcritlocal Wed Aug 09 19:09:37 2000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: mountcritlocal,v 1.2 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: mountcritlocal,v 1.2.4.1 2000/08/09 19:09:42 lukem Exp $
#
# PROVIDE: mountcritlocal
@@ -9,8 +9,22 @@
. /etc/rc.subr
name="mountcritlocal"
-start_cmd="mount_critical_filesystems local"
+start_cmd="mountcritlocal_start"
stop_cmd=":"
+mountcritlocal_start()
+{
+ # mount critical local filesystems
+ # (as specified in $critical_filesystems_beforenet)
+ #
+ mount_critical_filesystems local
+
+ # clean up left-over files.
+ # this could include the cleanup of lock files and /var/run, etc.
+ #
+ rm -f /etc/nologin /var/spool/lock/LCK.* /var/spool/uucp/STST/*
+ (cd /var/run && rm -rf -- *)
+}
+
load_rc_config $name
run_rc_command "$1"
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/mountcritremote
--- a/etc/rc.d/mountcritremote Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/mountcritremote Wed Aug 09 19:09:37 2000 +0000
@@ -1,13 +1,16 @@
#!/bin/sh
#
-# $NetBSD: mountcritremote,v 1.2 2000/05/13 08:45:07 lukem Exp $
+# $NetBSD: mountcritremote,v 1.2.4.1 2000/08/09 19:09:43 lukem Exp $
#
# PROVIDE: mountcritremote
-# REQUIRE: root mountcritlocal network
+# REQUIRE: NETWORK root mountcritlocal
. /etc/rc.subr
+# mount critical remote filesystems
+# (as specified in $critical_filesystems)
+#
name="mountcritremote"
start_cmd="mount_critical_filesystems remote"
stop_cmd=":"
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/mountd
--- a/etc/rc.d/mountd Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/mountd Wed Aug 09 19:09:37 2000 +0000
@@ -1,10 +1,10 @@
#!/bin/sh
#
-# $NetBSD: mountd,v 1.6 2000/06/02 22:54:11 fvdl Exp $
+# $NetBSD: mountd,v 1.6.2.1 2000/08/09 19:09:43 lukem Exp $
#
# PROVIDE: mountd
-# REQUIRE: mountall beforemountlkm network rpcbind quota
+# REQUIRE: NETWORK mountall beforemountlkm rpcbind quota
. /etc/rc.subr
diff -r 975c34aa56fa -r 40e779c60d31 etc/rc.d/network
--- a/etc/rc.d/network Wed Aug 09 18:50:30 2000 +0000
+++ b/etc/rc.d/network Wed Aug 09 19:09:37 2000 +0000
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $NetBSD: network,v 1.11.4.3 2000/08/03 12:07:27 itojun Exp $
+# $NetBSD: network,v 1.11.4.4 2000/08/09 19:09:44 lukem Exp $
#
# PROVIDE: network
@@ -10,7 +10,7 @@
name="network"
start_cmd="network_start"
-stop_cmd=":"
Home |
Main Index |
Thread Index |
Old Index