Commit Graph

4397 Commits

Author SHA1 Message Date
cvs2svn
d0023ab87e This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-06-12 22:58:51 +00:00
flz
28e479d336 Backout this commit since new bug reports have raised after the MFC:
- Set a two read-only variables (${prefix} and ${etcdir}). This is
    especially useful when using /etc/rc.d scripts with third-party
    software installed from ports.
    - Fix rc.d/sshd to work with openssh from ports using ${etcdir}
    instead of hardcoded /etc.
    - Reflect prefix/etcdir changes in rc.subr.8.
2006-06-09 10:14:39 +00:00
flz
5fac6874c1 MFC:
- Fix rc.d/sshd test on kern.random.sys.seeded.

      src/etc/rc.d/sshd: rev 1.10 -> 1.11

PR:		conf/94377
Submitted by:	dwhite
2006-06-07 10:35:33 +00:00
flz
ac74e6c969 MFC:
- Set a two read-only variables (${prefix} and ${etcdir}). This is
  especially useful when using /etc/rc.d scripts with third-party
  software installed from ports.
  - Fix rc.d/sshd to work with openssh from ports using ${etcdir}
  instead of hardcoded /etc.
  - Reflect prefix/etcdir changes in rc.subr.8.

      src/etc/rc.d/sshd: rev 1.9 -> 1.10
      src/etc/rc.subr: rev 1.51 -> 1.52
      src/share/man/man8/rc.subr.8: rev 1.11 -> 1.12
2006-06-07 10:33:36 +00:00
flz
f042dcd86d MFC:
- Change the "jail_" prefix for internal script variables. This fixes an
  issue where some global jail_* variables were overriden in the script. [1]
  - Change "jid" to "jname" in rc.conf(5), since it's more a jail name than a
  jail id. [1]
  - Update examples and comments in defaults/rc.conf to advertise new
  variables and the fact that some of the jail-specific variables may be made
  jail-global. [2]

      src/share/man/man5/rc.conf.5: rev 1.293 -> 1.294
      src/etc/rc.d/jail: rev 1.31 -> 1.32
      src/etc/defaults/rc.conf: rev 1.282 -> 1.283

Reported by:	pjd [1], clsung [2]
2006-06-06 15:04:39 +00:00
flz
1cd79ba7c7 MFC:
- Add new ntpd_config variable so that people can override it in rc.conf.
  - Add default value in /etc/defaults/rc.conf.
  - Add documentation bits to rc.conf(5).

      src/etc/rc.d/ntpd: rev 1.12 -> 1.13
      src/share/man/man5/rc.conf.5: rev 1.292 -> 1.293
      src/etc/defaults/rc.conf: rev 1.280 -> 1.281
2006-06-06 11:17:09 +00:00
flz
8febb4dd86 MFC:
- Harmless typo (s/overide/override/).
  - Sync rc.subr with NetBSD.
  - Merge some documentation bits.

      src/share/man/man8/rc.subr.8: rev 1.10 -> 1.11
      src/etc/rc.subr: rev 1.49 -> 1.51, 1.55 -> 1.56

Obtained from:	NetBSD
2006-06-06 10:35:55 +00:00
flz
a34acc2f8b MFC:
- Fix amd startup when amd is installed from ports.
  - Add the according amd_program default value in defaults.

      src/etc/rc.d/amd: rev 1.16 -> 1.17
      src/etc/defaults/rc.conf: rev 1.277 -> 1.278

PR:		conf/82738
Submitted by:	TAOKA Fumiyoshi <fmysh@iijmio-mail.jp>
2006-06-06 09:47:09 +00:00
dougb
8a2ae27d58 If NO_BIND_MTREE is set, we don't have anywhere to install the namedb files
to, so don't try.

The PR indicates that NO_BIND_NAMED would also trigger this problem, but
I was unable to reproduce it.

This is going directly to RELENG_6 because testing shows that HEAD is not
affected by this issue, likely due to the renovation of the make knobs
in that branch.

PR:		misc/97188
Submitted by:	Peter Losher <Peter_Losher@isc.org>
2006-06-04 06:38:00 +00:00
matteo
331043a5ff MFC rev 1.10:
Correctly set moused_$2_enable when moused_nondefault_enable is set to NO

PR:	conf/92654
2006-05-29 14:43:05 +00:00
marcus
49f16783d1 MFC:
Add a /media to FreeBSD.  /media is a directory designed to contain
subdirectories that will be used for removable media mount points (i.e.
mount points for CDs, floppy disks, USB drives, etc.).  While the primary
purpose of /media is to provide a location for HAL
(http://www.freedesktop.org/wiki/Software_2fhal) to mount volumes, it could
be used by any application that needs to manage removable media volumes.
2006-05-27 17:12:02 +00:00
matteo
8aded1455e MFC rev 1.30 - 1.31
if a jail fails to start, don't add its jid to /var/run and print a message with the error.
if we fail to start a jail and jail_foobar_*fs_enable or jail_foobar_mount_enable were set,
umount those filesystem before exiting.
If we set up an alias for jail's IP, remove that alias before exiting.
2006-05-26 13:33:45 +00:00
emax
eba7e09abb MFC:
Correct BD_ADDR entry for "Dummy" device in the default hcsecd.conf.
Each byte in BD_ADDR should exactly two nibbles, i.e
"1:2:3:4:5:6" is NOT valid and "01:02:03:04:05:06" is valid BD_ADDR.
2006-05-19 16:46:19 +00:00
ru
289808c039 MFC: 1.353: Fix "make distribution" when just NO_CRYPT is defined. 2006-05-11 15:56:47 +00:00
flz
aa5f82c89d MFC: Fix quoting.
src/etc/rc.d/jail: rev 1.28 -> 1.29

Reported by:	Dirk Engling <erdgeist at erdgeist.org>
Approved by:	pjd
2006-05-10 13:05:52 +00:00
flz
fd704b212b MFC:
- If no pidfile has been created at startup, only stop processes
  with current jid.

      src/etc/rc.subr: rev 1.53 -> 1.55

PR:		conf/93287
Submitted by:	anders
Approved by:	re (scottl)
2006-05-04 16:19:48 +00:00
flz
69ace2ef99 MFC:
- Add following global jail options, used if no jail-specific options are
  set:
   * jail_mount_enable
   * jail_devfs_ruleset
   * jail_devfs_enable
   * jail_fdescfs_enable
   * jail_procfs_enable
   * jail_fstab
   * jail_flags
  - Add a jail_interface / jail_<jid>_interface option. An ip alias will be
  created (jail_<jid>_ip) on jail_interface or jail_<jid>_interface if set.
  This is not a mandatory option.
  - Document all missing jail_* options in rc.conf(5).

      src/share/man/man5/rc.conf.5: rev 1.289 -> 1.290
      src/etc/rc.d/jail: rev 1.26 -> 1.27

Approved by:	re (scottl)
2006-05-04 16:17:48 +00:00
brueffer
9acdd73457 MFC: rev. 1.4
Correct two typos in comments.

Approved by:	re (hrs)
2006-04-26 18:38:43 +00:00
delphij
218dde9aca MFC revision 1.7
date: 2006/04/19 05:10:34;  author: delphij;  state: Exp;  lines: +1 -1
Make ldconfig as SERVER dependency.  This makes it possible
for some early starting services from the ports collection
to have their shared objects available before start.

Reviewed by:    freebsd-rc (dougb, brooks)
Approved by:	re (hrs)
2006-04-23 15:29:36 +00:00
mlaier
bbe7409e6e MFC pf.conf, 1.3:
Document the user/group LOR in our sample pf.conf

  Submitted by:	Devon H. O'Dell

Reminded by:	delphij
Approved by:	re (scottl)
2006-04-04 20:31:20 +00:00
flz
c9a9964ef8 MFC:
- Replace awk parts with shell.

      src/etc/rc.d/nsswitch: rev 1.5 -> 1.6

Approved by:	re (scottl)
2006-04-04 14:28:41 +00:00
marcel
9cbee16e0b MFC 1.10: On ia64, the unaligned_print sysctl is a debugging knob.
Approved by: re (hrs)
2006-04-03 04:34:47 +00:00
glebius
5316a30fa2 MFC 1.4, 1.5, 1.6:
- Do not point at bar.com.
  - Document how change polling interval for HC
    interface, counters.

Approved by:	re (scottl)
2006-03-31 12:47:50 +00:00
ceri
f7c89a92e7 MFC revision 1.71:
The rpc.pcnfsd server was in the base for a little over seven
	minutes back in 1994.  Change the example entry to point at the
	port, as per the entries for uucpd et al.

Approved by:	re (kensmith)
2006-03-28 15:52:12 +00:00
emax
3308876691 MFC:
Reorganize /etc/rc.d/syscons and move all keyboard related settings
into one function syscons_configure_keyboard(). Call new function from
both syscons_start() and sysconst_setkeyboard(). The reason for this
is because syscons_start() will (re)configure both keyboard and screen
settings. Apparently, some graphics cards have problems with running
vidcontrol(1) while X11 is running.

Remove "/etc/rc.d/syscons restart" from /etc/devd.conf. It is no longer
required. Using "/etc/rc.d/syscons setkeyboard" is enough. This also
should fix annoying "syscons not running?" message.

Tested by:	Ulrich Spoerlein < q at galgenberg dot net >
Approved by:	re (hrs)
2006-03-21 19:42:32 +00:00
matteo
c155e30263 Change "grep" with "egrep". Merging by hand is not always the best solution@
This change is approved, since the original patch I sent to re@, didn't have this mistake.

Submitted by:	gad
Approved by:	re (implicit)
2006-03-16 12:22:00 +00:00
dougb
88ccf9e397 MFC moving abi and archdep before SERVERS, and removing scary BEFORE's
MFC'ed versions:
SERVERS 1.6, abi 1.8, archdep 1.11

Reminded by:	delphij
Approved by:	re (scottl)
2006-03-15 00:09:43 +00:00
marcus
c25c26b047 MFC:
Add missing libdata/ldconfig[32] entries.

Approved by:	re (scottl)
2006-03-14 22:13:13 +00:00
matteo
f17126d605 MFC:
Fix output and exit status when daily_mailq_shorten is set to YES

PR:		conf/93472
Approved by:	re (scottl)
2006-03-12 18:42:11 +00:00
fjoe
354c2674c9 MFC: rev. 1.26
Fix overriding jail_list from command line.

Approved by:	re (mux)
2006-03-11 08:00:57 +00:00
yar
1ddd7ce832 MFC:
Two years ago, in rev. 1.12, a typo slipped in etc/isdn/Makefile:
  a control variable was misspelled as `SCRIPTS_NAME_isdntel.sh'
  (should've been `SCRIPTSNAME_isdntel.sh') when the Makefile was
  converted to using <bsd.prog.mk>.  Consequently, `isdntel.sh' has
  been installed as `isdntel' since then.  Nevertheless, nobody has
  been unhappy with the change.  So it's time to make it official.

Approved by:	re (mux)
2006-03-11 07:28:32 +00:00
matteo
d38d9c84d6 MFC: Enhance loginfail: it will catch sshd, proftpd and su errors, as well as other programs
PR:		conf/70973
Approved by:	re (hrs)
2006-03-09 06:55:36 +00:00
matteo
b69d57c403 MFC: Add a default ldconfig32_paths entry in default/rc.conf for 32-bit compatibility shared libraries.
It is used by the ldconfig rc.d scripts.

PR:		amd64/91571
Approved by:	re (hrs)
2006-03-09 06:52:39 +00:00
brueffer
565cbd1985 MFC: rev. 1.34 + 1.37
Add the gmirror(8), graid3(8), gstripe(8) and gconcat(8) status scripts,
default is "off".

Approved by:	re (mux), rwatson (mentor)
2006-03-08 23:01:18 +00:00
brueffer
ffd80e9451 MFC: rev. 1.13 + 1.14
Add periodic scripts that check the status of gmirror(8), graid3(8), gstripe(8)
and gconcat(8) devices, respectively.  Also sort.

Approved by:	re (mux), rwatson (mentor)
2006-03-08 22:59:47 +00:00
rwatson
05670a3ba0 Merge BSD.var.dist:1.73,1.74 from HEAD to RELENG_6:
Add /var/audit, mode 750, which will hold audit trail files.

  Change group for /var/audit to audit, so that audit review can be
  delegated to non-administrators.

  Obtained from:  TrustedBSD Project

Approved by:	re (mux)
2006-03-08 22:55:13 +00:00
cvs2svn
9cb23632cc This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-03-08 18:03:10 +00:00
emax
f6ce5746e7 MFC:
Add new 'setkeyboard' method to the /etc/rc.d/syscons. It accepts the
keyboard device name (i.e. /dev/kbd0). This method will do nothing is
kbdmux(4) is the current active keyboard, otherwise it will switch
active keyboard as requested.

Modify ukbd(4) entries in the /etc/devd.conf to use /etc/rc.d/syscons
and new 'setkeyboard' method.

Approved by:	re (scottl)
2006-03-07 06:13:17 +00:00
rwatson
78ceb60160 Merge group:1.33,1.34 from HEAD to RELENG_6:
Assign gid 77 to audit instead of gid 73.  The ports group list did not
  include '73', which was assigned in a ports passwd entry to ircservices.

  Pointed out by: ceri

  Allocate an 'audit' group, membership in which will grant the audit
  review right by virtue of read file permission on /var/audit and its
  contents.

  Obtained from:  TrustedBSD Project

Approved by:	re (scottl)
2006-03-06 22:23:10 +00:00
mlaier
b439464437 MFC:
Make pflog a seperate module.  As a result pflog_packet() becomes a
  function pointer that is declared in pf_ioctl.c

  Requested by:   yar (as part of the module build reorg)

Approved by:	re (scottl)
2006-03-06 16:10:19 +00:00
wkoszek
8d656c8e43 MFC:
Use 'ipfw list' instead of 'ipfw l', since it's deprecated (and warning is
  printed on system startup).

  Approved by:    cognet (mentor)

Approved by:	re (scottl)
2006-03-01 11:36:01 +00:00
mnag
bb7b6e16f5 - Change dumpdev default to "NO". Only HEAD is set to "AUTO"
Discussed with:	re
Approved by:	re (scottl)
2006-02-25 22:53:40 +00:00
dougb
7d90dc4ee4 MFC 1.339, fix for running inside a jail
Approved by:	re (mux)
2006-02-24 21:42:43 +00:00
dougb
e06b34cad1 MFC significant overhaul of rc.d/named script, including
addition of named_uid default rc.conf variable.

etc/defaults/rc.conf		1.275
etc/rc.d/named			1.24
share/man/man5/rc.conf.5	1.286

Approved by:	re (scottl)
2006-02-24 09:43:33 +00:00
ceri
5ae1a9f419 MFC revision 1.49:
Update a comment to match functionality changed in r1.39 (allow square
  brackets in process names).

Approved by:	re (scottl)
2006-02-19 18:36:20 +00:00
ume
cc52cf5ad6 MFC 1.20: The libwrap built with NO_INET6=yes cannot parse
an IPv6 address.  So, mention it in comment.

Approved by:	re (scottl)
2006-02-19 14:59:00 +00:00
marius
e1b43165f7 MFC: 1.12
Enable getty(8) on ttyu2 by default in order to get machines that use a
RSC (Remote System Control) connected via uart2 as console working out
of the box.

Approved by:	re (scottl)
2006-02-15 09:17:03 +00:00
flz
fd4449bc91 MFC:
Don't include geli devices in list when noauto is specified in the options field.

      src/etc/rc.subr: rev 1.47 -> 1.48

Approved by:	re (hrs)
2006-02-15 00:56:06 +00:00
flz
fadeb41ea3 MFC:
- Add a startup script for hostapd.
  - Document associated variable in rc.conf(5).

      src/etc/rc.d/Makefile: rev 1.64 -> 1.65
      src/share/man/man5/rc.conf.5: rev 1.283 -> 1.284
      src/etc/rc.d/hostapd: rev 0 -> 1.1
      src/etc/defaults/rc.conf: rev 1.273 -> 1.274

Approved by:	re (hrs)
2006-02-12 22:13:16 +00:00
cvs2svn
de143a5b92 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-02-03 01:35:37 +00:00