diff options
| author | Bob Beck <beck@cvs.openbsd.org> | 2004-02-11 23:17:34 +0000 |
|---|---|---|
| committer | Bob Beck <beck@cvs.openbsd.org> | 2004-02-11 23:17:34 +0000 |
| commit | 557ce9e4dfde35d40d4939c01760f9e99a882f9f (patch) | |
| tree | 90fb344b8aac8971f3c8c901bd8b80e83c6a919f | |
| parent | a79d84215a9fcfcb0ef6cdfe3e165432a7d9e4ab (diff) | |
simplify afs startup so all you have to do is say "YES" to get basic
AFS functionality (enough to to pkg_add's)
| -rw-r--r-- | etc/rc | 9 | ||||
| -rw-r--r-- | etc/rc.conf | 6 |
2 files changed, 7 insertions, 8 deletions
@@ -1,4 +1,4 @@ -# $OpenBSD: rc,v 1.232 2004/01/23 22:11:40 deraadt Exp $ +# $OpenBSD: rc,v 1.233 2004/02/11 23:17:32 beck Exp $ # System startup script run by init on autoboot # or after single-user. @@ -306,10 +306,11 @@ if [ -d /var/crash ]; then savecore ${savecore_flags} /var/crash fi -if [ "X${afs}" = X"YES" -a -c ${afs_device} -a -d ${afs_mount_point} ]; then +if [ "X${afs}" = X"YES" -a -c /dev/xfs0 ]; then echo -n 'mounting afs:' - mount -t xfs ${afs_device} ${afs_mount_point} - /usr/libexec/afsd ${afsd_flags} -d ${afs_device} + mkdir -p -m 0755 /afs + mount -t xfs /dev/xfs0 /afs + /usr/libexec/afsd ${afsd_flags} echo ' done.' fi diff --git a/etc/rc.conf b/etc/rc.conf index fab993fbcd7..f87d854f5c3 100644 --- a/etc/rc.conf +++ b/etc/rc.conf @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: rc.conf,v 1.92 2004/01/23 22:11:40 deraadt Exp $ +# $OpenBSD: rc.conf,v 1.93 2004/02/11 23:17:33 beck Exp $ # set these to "NO" to turn them off. otherwise, they're used as flags routed_flags=NO # for normal use: "-q" @@ -78,9 +78,7 @@ amd_master=/etc/amd/master # AMD 'master' map syslogd_flags= # add more flags, ie. "-u -a /chroot/dev/log" pf_rules=/etc/pf.conf # Packet filter rules file pflogd_flags= # add more flags, ie. "-s 256" -afs_mount_point=/afs # Mountpoint for AFS -afs_device=/dev/xfs0 # Device used by afsd -afsd_flags=-z # Flags passed to afsd +afsd_flags= # Flags passed to afsd shlib_dirs= # extra directories for ldconfig, separated # by space |