10506 Commits

Author SHA1 Message Date
ceri
9680b98fd3 MFC:
devices.c	revision 1.164
	tcpip.c 	revision 1.135

  s/lp/plip/ for PLIP interfaces.

Approved by:	re (mux)
2006-02-25 18:51:13 +00:00
markus
f0fed5c831 MFC: rev 1.2
Fix scancode translation table

Approved by:	re (scottl), emax
2006-02-23 15:37:43 +00:00
cvs2svn
34436ebdd7 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-02-22 21:51:10 +00:00
krion
846e0cb061 MFC: perform.c: 1.15
date: 2006/02/12 16:09:33;  author: krion;  state: Exp;  lines: +5 -4
  Fix pkg_version with the -o argument to print the origin.

Approved by:	re (scottl)
2006-02-22 16:28:42 +00:00
sam
ce04d23805 MFC: Change default build of wpa_supplicant to include EAPOL support
Approved by:	re (scottl, hrs)
2006-02-21 17:19:54 +00:00
markus
fbabbd9d5a MFC: rev. 1.6
- Grammar fixes
- Reword one sentence

Approved by:	re (scottl), brueffer
2006-02-19 15:44:51 +00:00
markus
4b6a3490b9 MFC: rev. 1.2
- Fix attribute id of HIDBatteryPower
- Fix two typos in comments

Approved by:	re (scottl), emax
2006-02-19 15:39:31 +00:00
glebius
7fb01282ec MFC 1.62:
Refuse to install invalid ARP entries.

  Submitted by:		Vitaliy Ovsyannikov <V.Ovsyannikov kr.ru>

Approved by:	re (kensmith)
2006-02-16 12:41:18 +00:00
rwatson
8e731cacbc Merge mergemaster.8:1.34, mergemaster.sh:1.53 from HEAD to RELENG_6:
Add a -A argument to mergemaster to allow explicitly specifying an
  architecture to pass through to the underlying makefiles.  This is
  quite useful when building on an i386 box to populate an amd64 NFS
  root.

  Head nod:       dougb

Approved by:	re (scottl)
2006-02-13 23:47:48 +00:00
ceri
bc3c1b31ae MFC revision 1.10:
Another update for reality: "dangerously dedicated" mode is
  now achieved by hitting 'F', which is no longer undocumented.

Approved by:	re (scottl)
2006-02-13 21:03:55 +00:00
ceri
4285305817 MFC revision 1.414:
Correct a user-visible typo.

Approved by:	re (scottl)
2006-02-13 21:02:35 +00:00
ceri
b86b7b2ee0 MFC the following revisions of the help files:
Bring these files somewhat into the present.
  Perform some rewording while here.

  Remove register.hlp, since the code that deals with it was removed
  nearly 7 years ago.

  Revision  Changes    Path
  1.2       +2 -0      src/usr.sbin/sysinstall/help/anonftp.hlp
  1.15      +9 -10     src/usr.sbin/sysinstall/help/distributions.hlp
  1.5       +1 -5      src/usr.sbin/sysinstall/help/fixit.hlp
  1.3       +1 -1      src/usr.sbin/sysinstall/help/html.hlp
  1.9       +75 -18    src/usr.sbin/sysinstall/help/options.hlp
  1.14      +2 -2      src/usr.sbin/sysinstall/help/partition.hlp
  1.6       +0 -76     src/usr.sbin/sysinstall/help/register.hlp (dead)
  1.3       +2 -2      src/usr.sbin/sysinstall/help/securelevel.hlp
  1.12      +15 -12    src/usr.sbin/sysinstall/help/shortcuts.hlp
  1.9       +1 -7      src/usr.sbin/sysinstall/help/slice.hlp
  1.10      +10 -2     src/usr.sbin/sysinstall/help/tcp.hlp
  1.7       +5 -5      src/usr.sbin/sysinstall/help/usermgmt.hlp

Approved by:	re (scottl)
2006-02-13 21:01:23 +00:00
delphij
f865c8d9db MFC a set of changes that fixes DHCP handling in sysinstall(8)
* network.c,v 1.53 (by ceri):
   Fixes DHCP handling to use a more robust way to determine whether
   DHCP should be used.
 * tcpip.c,v 1.134:
   Avoid adding unnecessary tailing space when no media option(s) is
   specified.

Approved by:	re (scottl)
2006-02-12 15:23:50 +00:00
cvs2svn
de143a5b92 This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-02-03 01:35:37 +00:00
jkim
9ca5124a7d MFC: usr.sbin/sysinstall/disks.c 1.155
- Hide 'incorrect geometry warning' in non-interactive mode. Users should
know what they are doing in non-interactive mode.  Less scarier warning
goes to debugging info instead.
- Print sanitized geometry to debugging info.
2006-01-31 22:07:18 +00:00
jkim
59efc5f86e MFC: Add `mediaOpen' function. This function mounts selected media device.
For example, you can dynamically generate and load configuration file
depending on the hardware configuration with the following template:

	mediaSetCDROM
	mediaOpen
	command=/dist/scripts/install.sh
	system
	mediaClose
	configFile=generated.cfg
	loadConfig

Now we have full access to files on the media before installation begins.
2006-01-31 22:03:19 +00:00
krion
be897ab3b0 MFC: pkg_add.1:1.70
date: 2006/01/29 20:30:55;  author: krion;  state: Exp;  lines: +1 -1
  Fix typo.
2006-01-31 18:33:59 +00:00
cperciva
b6e09e9ba7 MFC rev. 1.14:
Replace "fetch" with "fetch -r" when downloading the initial ~38MB
  snapshot in order to avoid unnecessary re-downloading.

  Remove the earlier "rm -f ${SNAPSHOTHASH}.tgz" to make this work.
2006-01-30 04:18:12 +00:00
philip
1a0293eda7 MFC:
Add [-J jid_file] option to write out a JidFile, similar to a PidFile,
  containing the jailid, path, hostname, ip and the command used to start
  the jail.

      src/usr.sbin/jail/jail.8: rev 1.71 -> 1.72
      src/usr.sbin/jail/jail.c: rev 1.20 -> 1.21

PR:		misc/89883
Submitted by:	L. Jason Godsey <lannygodsey -at- yahoo.com>
Reviewed by:	phk
2006-01-30 00:38:37 +00:00
philip
d5c81a9bd0 MFC:
Add "yet another" moused(8) hack: suspend handling mouse events when SIGUSR1
  is caught.  Can be assigned to a window manager shortcut to prevent accidents
  with touchpads.

      src/usr.sbin/moused/moused.8: rev 1.57 -> 1.58
      src/usr.sbin/moused/moused.c: rev 1.74 -> 1.75

PR:		bin/89357
Submitted by:	Nick Hibma <nick -at- van-laarhoven.org>
2006-01-30 00:32:40 +00:00
harti
aab4200093 MFC the HOSTRES-MIB. This is exactly the same version as in HEAD except for
a slightly different mechanism to load geom_md (g_me) which was renamed at
some point. This has been tested on RELENG_6 by erwin and glebius.

Reviewed by:	erwin, glebius
2006-01-27 16:27:34 +00:00
cperciva
a1101f1dce MFC rev. 1.8:
Correctly identify the host and port values on a failed
  getaddrinfo lookup.
2006-01-27 14:44:15 +00:00
cvs2svn
7fcb1e9c3c This commit was manufactured by cvs2svn to create branch 'RELENG_6'. 2006-01-26 12:19:11 +00:00
harti
9d9c8d901e MFC: SNMP module build infrastucture:
share/man/man7/Makefile:1.30
	share/mk/Makefile:1.47
	usr.sbin/bsnmpd/modules/Makefile.inc:1.12
	usr.sbin/bsnmpd/modules/snmp_atm/Makefile:1.4
	usr.sbin/bsnmpd/modules/snmp_mibII/Makefile:1.6
	usr.sbin/bsnmpd/modules/snmp_netgraph/Makefile:1.7
	usr.sbin/bsnmpd/modules/snmp_netgraph/snmp_netgraph.c:1.6
	usr.sbin/bsnmpd/modules/snmp_pf/Makefile:1.2
	share/man/man7/bsd.snmpmod.mk.7:1.4
	share/mk/bsd.snmpmod.mk:1.2
2006-01-25 13:22:59 +00:00
matteo
ecf1277aef MFC:
Honour the "uuid" directive in adduser.conf

      src/usr.sbin/adduser/adduser.sh: rev 1.26 -> 1.27

PR:		conf/87914

Approved by:	philip (mentor, implicit)
2006-01-25 07:43:48 +00:00
gad
751980ab6f MFC 1.103: Improve the handling of errors that might happen with the fork()
done to compress files after they have been rotated.
2006-01-25 04:10:59 +00:00
joel
2d6cdc2b7e MFC: s/5.5/6.0/ in HISTORY section. 2006-01-24 17:02:39 +00:00
ceri
7cebe2cfa5 MFC revision 1.150:
On i386, 7.0 requires 106MB on /usr.  6.0 requires 101MB.
  Bump USR_MIN_SIZE to 128MB, so that an auto-layout install won't fail
  due to /usr being too small.
2006-01-24 15:51:33 +00:00
brooks
ebafce1b5d MFC the ability to restrict deletions to a particular inteface in the -a
case.
2006-01-24 05:39:22 +00:00
cperciva
a9136f59b5 MFC rev 1.5:
Mention that the random time slept by "portsnap cron" is between 1 and
  3600 seconds.
2006-01-21 09:56:28 +00:00
ceri
2a7cb7f0ba MFC revision 1.133:
Preserve any additional arguments to ifconfig that were specified in
  the DHCP case too.
2006-01-20 18:46:06 +00:00
harti
2c80e8f4d2 MFC: BEGEMOT_1_11 and vendor patches:
config.c: 1.1.1.7
	main.c: 1.1.1.10, 1.1.1.11
	snmpd.config: 1.1.1.6
2006-01-20 16:34:37 +00:00
harti
03e2bbe4b2 MFC: BEGEMOT_1_11 and vendor fixes:
mibII.c: 1.1.1.9
	mibII_interfaces.c: 1.1.1.7
2006-01-20 16:27:36 +00:00
ceri
2f6c15280f MFC revision 1.413:
Add ntp.cgi.cz.
2006-01-20 13:03:13 +00:00
ceri
4fd8a7fa17 MFC revisions 1.36 and 1.37:
r1.36:
	  Correct obsolete chown syntax.

	r1.37:
	  If sysinstall was used to configure an anonymous FTP area, it
	was possible for information to be copied from the group file to
	the group file in the FTP area.  This patch based on a patch
	from Zak Johnson <zakj at nox dot cx>.
2006-01-20 13:00:32 +00:00
flz
491b3507c0 MFC:
Add -K option to pkg_add and pkg_info.
  This option saves packages to PKGDIR (if defined or current directory by default)
  as they are downloaded.
  Silent a warning when -n is used and package has a +DISPLAY file.

      src/usr.sbin/pkg_install/info/perform.c: rev 1.53 -> 1.54
      src/usr.sbin/pkg_install/add/main.c: rev 1.65 -> 1.66
      src/usr.sbin/pkg_install/lib/lib.h: rev 1.56 -> 1.57
      src/usr.sbin/pkg_install/info/pkg_info.1: rev 1.55 -> 1.56
      src/usr.sbin/pkg_install/add/add.h: rev 1.12 -> 1.13
      src/usr.sbin/pkg_install/add/pkg_add.1: rev 1.68 -> 1.69
      src/usr.sbin/pkg_install/add/perform.c: rev 1.78 -> 1.79
      src/usr.sbin/pkg_install/info/info.h: rev 1.28 -> 1.29
      src/usr.sbin/pkg_install/lib/url.c: rev 1.4 -> 1.5
      src/usr.sbin/pkg_install/info/main.c: rev 1.48 -> 1.49
2006-01-16 19:51:41 +00:00
delphij
68b438857e MFC pidfile(3) function, and convert several applications to make use
of it.

Bump __FreeBSDversion for the MFC.

Discussed with:	pjd
2006-01-15 17:50:38 +00:00
pav
b68f1c7b71 MFC 1.16: fix: documentation for -m option was inserted halfway thru the text
of -l option.
2006-01-13 20:02:56 +00:00
cperciva
dad028c05c MFC:
Make "portsnap extract" automatically create ${PORTSDIR} if necessary
  instead of complaining that "Directory does not exist or is not
  writable".
2006-01-13 00:53:53 +00:00
flz
384cb78489 MFC:
Fix -r causing SIGSEGV due to parse_args() being called before font_current is set.

      src/usr.sbin/kbdmap/kbdmap.c: rev 1.4
2006-01-12 01:26:34 +00:00
krion
742f52a8cb MFC: add/extract.c:1.44 create/perform.c:1.82 create/pkg_create.1:1.70 create/pl.c:1.28
info/show.c:1.40 lib/plist.c:1.51

  date: 2006/01/07 22:10:57;  author: krion;  state: Exp;  lines: +10 -3
  When using @cwd %%FOO%%, we must ensure to return in the original
  prefix later, but doing so with @cwd %%OLDPREFIX%% (having
  PLIST_SUB+="OLDPREFIX=${PREFIX}") hardcodes the value in the packing
  list. That's not really a problem when dealing with ports but that's
  a problem with packages since pkg_add -p option only overrides the
  first @cwd occurrence.

  This patch allow us to use @cwd without any argument. If no
  directory argument is given, it will set current working directory
  to the first prefix given by the @cwd command.

  PR:             bin/77212
  Submitted by:   flz
2006-01-10 22:17:08 +00:00
ceri
f62c4a36d2 MFC revision 1.82:
inetd(8) requires that /etc/netconfig be present, and contain entries
  for each of udp and tcp (and their IPv6 equivalents when INET6 is
  enabled).  Note that dependency here.

  PR:             docs/90435
  Submitted by:   Dmitry Kazarov <kazarov at mcm dot ru>
  Pointed out by: Daniel Gerzo <danger at rulez dot sk>
2006-01-07 13:57:58 +00:00
ceri
ac30b2fccc MFC revision 1.364:
An i386 machine with 32MB of RAM requires a 700MB disk for auto-layout to
  succeed, whilst an i386 with 256MB of RAM requires more.  Up the amount
  of disk hinted at as a minimum requisite for auto-layout.
2006-01-06 20:10:41 +00:00
ariff
3c58551f23 MFC:
- Fix possible memory leak due to repetetive strdup(3) without matching
     free(3).
   - print_recsrc() should honor shortflag and give appropriate output for
     later consumption by /etc/rc.d/mixer. This will ensure that recording
     device selections survived across reboot. Output everything to stdout
     instead of stderr.
2006-01-04 00:32:14 +00:00
marcel
14fe1a0c49 MFC standardization of the ELF types and update of the ELF constants:
lib/libc/gen/nlist.c:1.19
	libexec/rtld-elf/rtld.c:1.108
	libexec/rtld-elf/rtld.h:1.36
	libexec/rtld-elf/alpha/reloc.c:1.21
	libexec/rtld-elf/amd64/reloc.c:1.16
	libexec/rtld-elf/ia64/reloc.c:1.16
	libexec/rtld-elf/sparc64/reloc.c:1.11
	share/man/man5/elf.5:1.32-1.33
	sys/alpha/alpha/elf_machdep.c:1.20
	sys/amd64/amd64/elf_machdep.c:1.24
	sys/boot/common/bootstrap.h:1.42
	sys/boot/common/load_elf.c:1.33
	sys/boot/common/load_elf_obj.c:1.2
	sys/boot/common/reloc_elf.c:1.2
	sys/ia64/ia64/elf_machdep.c:1.21
	sys/kern/link_elf.c:1.87
	sys/kern/link_elf_obj.c:1.90
	sys/sparc64/sparc64/elf_machdep.c:1.20
	sys/sys/elf32.h:1.9-1.10
	sys/sys/elf64.h:1.11-1.13
	sys/sys/elf_common.h:1.16
	sys/sys/elf_generic.h:1.7
	sys/sys/imgact_elf.h:1.28
	sys/sys/linker.h:1.40
	usr.bin/elf2aout/elf2aout.c:1.10
	usr.bin/elfdump/elfdump.c:1.13
	usr.sbin/crunch/crunchide/exec_elf32.c:1.15
	usr.sbin/kldxref/ef.c:1.9
	usr.sbin/kldxref/ef.h:1.6
	usr.sbin/kldxref/ef_amd64.c:1.3
	usr.sbin/kldxref/ef_i386.c:1.3
	usr.sbin/kldxref/ef_obj.c:1.4
	usr.sbin/kldxref/ef_powerpc.c:1.3
	usr.sbin/kldxref/ef_sparc64.c:1.4-1.5
2005-12-30 22:13:59 +00:00
sobomax
7d384c2f8a MFC: provide example of how to make two keyboards working at the same time
using kbdmux(4).
2005-12-29 20:15:27 +00:00
sobomax
52480b0ed0 MFC: fix logic error which causes <null> to be printed instead of the
actual file name in error message.
2005-12-29 06:04:51 +00:00
glebius
9c2a5c3b76 MFC:
Add a knob to suppress logging of attempts to modify
  permanent ARP entries.

  Submitted by:   Andrew Alcheyev <buddy telenet.ru>
2005-12-28 13:33:41 +00:00
wilko
ae84954d32 Add an example for WEP.
OK-ed by: sam
2005-12-25 22:31:54 +00:00
dougb
83dcdc924b MFC 1.52, do not delete stale /etc/rc.d files by default 2005-12-21 09:04:24 +00:00