Permalink
Browse files

Merge branch 'master' of https://github.com/freebsd/freebsd

Conflicts:
	sys/conf/newvers.sh
  • Loading branch information...
2 parents 404ef10 + 5cca672 commit d9f76a0f6e1e1242f02320ed4a00635ba6393b78 @kmoore134 kmoore134 committed Oct 10, 2013
Showing with 31,062 additions and 3,571 deletions.
  1. +2 −23 ObsoleteFiles.inc
  2. +21 −15 UPDATING
  3. +1 −0 bin/Makefile
  4. +1 −2 {libexec → bin}/freebsd-version/Makefile
  5. +2 −2 {libexec → bin}/freebsd-version/freebsd-version.1
  6. 0 {libexec → bin}/freebsd-version/freebsd-version.sh.in
  7. +652 −645 cddl/contrib/opensolaris/cmd/dtrace/dtrace.1
  8. +15 −7 contrib/binutils/opcodes/i386-dis.c
  9. +2 −1 contrib/binutils/opcodes/i386-opc.h
  10. +18 −0 contrib/binutils/opcodes/i386-opc.tbl
  11. +5 −0 contrib/binutils/opcodes/i386-tbl.h
  12. +1 −1 etc/defaults/periodic.conf
  13. +1 −34 etc/defaults/rc.conf
  14. +67 −10 etc/network.subr
  15. +299 −570 etc/rc.d/jail
  16. +33 −4 etc/rc.d/netif
  17. +1 −1 etc/rc.d/sshd
  18. +0 −22 etc/rc.subr
  19. +5 −0 gnu/usr.bin/Makefile
  20. +2 −1 gnu/usr.bin/groff/tmac/mdoc.local
  21. +24 −0 gnu/usr.bin/rcs/CREDITS
  22. +3 −0 gnu/usr.bin/rcs/Makefile
  23. +3 −0 gnu/usr.bin/rcs/Makefile.inc
  24. +548 −0 gnu/usr.bin/rcs/NEWS
  25. +90 −0 gnu/usr.bin/rcs/REFS
  26. +8 −0 gnu/usr.bin/rcs/ci/Makefile
  27. +898 −0 gnu/usr.bin/rcs/ci/ci.1
  28. +1,318 −0 gnu/usr.bin/rcs/ci/ci.c
  29. +8 −0 gnu/usr.bin/rcs/co/Makefile
  30. +736 −0 gnu/usr.bin/rcs/co/co.1
  31. +826 −0 gnu/usr.bin/rcs/co/co.c
  32. +1,518 −0 gnu/usr.bin/rcs/doc/rcs.ms
  33. +95 −0 gnu/usr.bin/rcs/doc/rcs_func.ms
  34. +8 −0 gnu/usr.bin/rcs/ident/Makefile
  35. +182 −0 gnu/usr.bin/rcs/ident/ident.1
  36. +270 −0 gnu/usr.bin/rcs/ident/ident.c
  37. +14 −0 gnu/usr.bin/rcs/lib/Makefile
  38. +400 −0 gnu/usr.bin/rcs/lib/conf.h
  39. +344 −0 gnu/usr.bin/rcs/lib/maketime.c
  40. +39 −0 gnu/usr.bin/rcs/lib/maketime.h
  41. +148 −0 gnu/usr.bin/rcs/lib/merger.c
  42. +701 −0 gnu/usr.bin/rcs/lib/partime.c
  43. +71 −0 gnu/usr.bin/rcs/lib/partime.h
  44. +762 −0 gnu/usr.bin/rcs/lib/rcsbase.h
  45. +1,958 −0 gnu/usr.bin/rcs/lib/rcsedit.c
  46. +354 −0 gnu/usr.bin/rcs/lib/rcsfcmp.c
  47. +1,132 −0 gnu/usr.bin/rcs/lib/rcsfnms.c
  48. +681 −0 gnu/usr.bin/rcs/lib/rcsgen.c
  49. +452 −0 gnu/usr.bin/rcs/lib/rcskeep.c
  50. +186 −0 gnu/usr.bin/rcs/lib/rcskeys.c
  51. +1,568 −0 gnu/usr.bin/rcs/lib/rcslex.c
  52. +69 −0 gnu/usr.bin/rcs/lib/rcsmap.c
  53. +911 −0 gnu/usr.bin/rcs/lib/rcsrev.c
  54. +681 −0 gnu/usr.bin/rcs/lib/rcssyn.c
  55. +191 −0 gnu/usr.bin/rcs/lib/rcstime.c
  56. +1,398 −0 gnu/usr.bin/rcs/lib/rcsutil.c
  57. +2 −0 gnu/usr.bin/rcs/lib/version.c
  58. +8 −0 gnu/usr.bin/rcs/merge/Makefile
  59. +137 −0 gnu/usr.bin/rcs/merge/merge.1
  60. +113 −0 gnu/usr.bin/rcs/merge/merge.c
  61. +10 −0 gnu/usr.bin/rcs/rcs/Makefile
  62. +454 −0 gnu/usr.bin/rcs/rcs/rcs.1
  63. +1,629 −0 gnu/usr.bin/rcs/rcs/rcs.c
  64. +425 −0 gnu/usr.bin/rcs/rcs/rcsfile.5
  65. +302 −0 gnu/usr.bin/rcs/rcs/rcsintro.1
  66. +8 −0 gnu/usr.bin/rcs/rcsclean/Makefile
  67. +203 −0 gnu/usr.bin/rcs/rcsclean/rcsclean.1
  68. +333 −0 gnu/usr.bin/rcs/rcsclean/rcsclean.c
  69. +8 −0 gnu/usr.bin/rcs/rcsdiff/Makefile
  70. +158 −0 gnu/usr.bin/rcs/rcsdiff/rcsdiff.1
  71. +480 −0 gnu/usr.bin/rcs/rcsdiff/rcsdiff.c
  72. +7 −0 gnu/usr.bin/rcs/rcsfreeze/Makefile
  73. +68 −0 gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.1
  74. +99 −0 gnu/usr.bin/rcs/rcsfreeze/rcsfreeze.sh
  75. +8 −0 gnu/usr.bin/rcs/rcsmerge/Makefile
  76. +189 −0 gnu/usr.bin/rcs/rcsmerge/rcsmerge.1
  77. +286 −0 gnu/usr.bin/rcs/rcsmerge/rcsmerge.c
  78. +454 −0 gnu/usr.bin/rcs/rcstest
  79. +8 −0 gnu/usr.bin/rcs/rlog/Makefile
  80. +318 −0 gnu/usr.bin/rcs/rlog/rlog.1
  81. +1,290 −0 gnu/usr.bin/rcs/rlog/rlog.c
  82. +14 −10 lib/libprocstat/libprocstat.c
  83. +6 −2 lib/libstand/tftp.c
  84. +11 −6 lib/libutil/humanize_number.3
  85. +43 −31 lib/libutil/humanize_number.c
  86. +27 −0 lib/libvmmapi/vmmapi.c
  87. +1 −0 lib/libvmmapi/vmmapi.h
  88. +0 −1 libexec/Makefile
  89. +0 −5 release/release.sh
  90. +1 −1 sbin/camcontrol/camcontrol.c
  91. +2 −0 sbin/camcontrol/fwdownload.c
  92. +6 −31 sbin/iscontrol/iscsi.conf.5
  93. +7 −5 sbin/nvmecontrol/perftest.c
  94. +5 −0 sbin/route/route.c
  95. +6 −0 share/doc/psd/13.rcs/Makefile
  96. +5 −0 share/doc/psd/13.rcs/Makefile.inc
  97. +7 −0 share/doc/psd/13.rcs/rcs/Makefile
  98. +6 −0 share/doc/psd/13.rcs/rcs_func/Makefile
  99. +1 −0 share/doc/psd/Makefile
  100. +2 −2 share/examples/bhyve/vmrun.sh
  101. +4 −4 share/man/man4/altera_avgen.4
  102. +2 −2 share/man/man4/rsu.4
  103. +127 −351 share/man/man5/rc.conf.5
  104. +8 −8 share/man/man5/src.conf.5
  105. +4 −8 share/man/man8/picobsd.8
  106. +2 −0 share/man/man9/Makefile
  107. +88 −0 share/man/man9/VOP_ADVISE.9
  108. +84 −0 share/man/man9/VOP_ALLOCATE.9
  109. +0 −9 share/man/man9/VOP_FSYNC.9
  110. +2 −2 share/man/man9/firmware.9
  111. +1 −1 share/man/man9/vm_page_grab.9
  112. +2 −0 share/man/man9/vnode.9
  113. +14 −5 share/misc/bsd-family-tree
  114. +1 −0 share/misc/committers-src.dot
  115. +1 −0 share/mk/bsd.own.mk
  116. +1 −0 sys/amd64/amd64/pmap.c
  117. +0 −1 sys/arm/s3c2xx0/uart_bus_s3c2410.c
  118. +0 −2 sys/arm/s3c2xx0/uart_cpu_s3c2410.c
  119. +6 −9 sys/cam/cam_xpt.c
  120. +101 −40 sys/cam/ctl/ctl_frontend_iscsi.c
  121. +0 −9 sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c
  122. +10 −0 sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c
  123. +1 −1 sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c
  124. +3 −1 sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c
  125. +2 −0 sys/cddl/dev/dtrace/dtrace_load.c
  126. +2 −0 sys/cddl/dev/dtrace/dtrace_unload.c
  127. +2 −2 sys/conf/newvers.sh
  128. +2 −0 sys/conf/options.mips
  129. +1 −1 sys/contrib/ipfilter/netinet/ip_rcmd_pxy.c
  130. +1 −1 sys/contrib/ipfilter/netinet/ip_tftp_pxy.c
  131. +10 −0 sys/dev/ath/ath_hal/ar5212/ar5212.h
  132. +56 −16 sys/dev/ath/ath_hal/ar5212/ar5212_ani.c
  133. +36 −2 sys/dev/ath/ath_hal/ar5212/ar5212_misc.c
  134. +1 −1 sys/dev/cxgbe/t4_main.c
  135. +1 −4 sys/dev/cxgbe/t4_sge.c
  136. +160 −198 sys/dev/e1000/e1000_80003es2lan.c
  137. +5 −7 sys/dev/e1000/e1000_80003es2lan.h
  138. +16 −11 sys/dev/e1000/e1000_82571.c
  139. +287 −38 sys/dev/e1000/e1000_82575.c
  140. +5 −0 sys/dev/e1000/e1000_82575.h
  141. +8 −3 sys/dev/e1000/e1000_api.c
  142. +40 −0 sys/dev/e1000/e1000_defines.h
  143. +15 −1 sys/dev/e1000/e1000_hw.h
  144. +165 −102 sys/dev/e1000/e1000_i210.c
  145. +6 −2 sys/dev/e1000/e1000_i210.h
  146. +285 −151 sys/dev/e1000/e1000_ich8lan.c
  147. +34 −16 sys/dev/e1000/e1000_ich8lan.h
  148. +29 −11 sys/dev/e1000/e1000_mac.c
  149. +1 −0 sys/dev/e1000/e1000_osdep.h
  150. +231 −54 sys/dev/e1000/e1000_phy.c
  151. +14 −4 sys/dev/e1000/e1000_phy.h
  152. +10 −2 sys/dev/e1000/e1000_regs.h
  153. +54 −52 sys/dev/e1000/e1000_vf.h
  154. +498 −435 sys/dev/e1000/if_igb.c
  155. +140 −115 sys/dev/e1000/if_igb.h
  156. +21 −19 sys/dev/hyperv/storvsc/hv_storvsc_drv_freebsd.c
  157. +4 −2 sys/dev/hyperv/storvsc/hv_vstorage.h
  158. +4 −1 sys/dev/hyperv/vmbus/hv_channel.c
  159. +17 −17 sys/dev/hyperv/vmbus/hv_hv.c
  160. +3 −1 sys/dev/hyperv/vmbus/hv_vmbus_drv_freebsd.c
  161. +11 −9 sys/dev/hyperv/vmbus/hv_vmbus_priv.h
  162. +1 −0 sys/dev/isci/isci.c
  163. +7 −2 sys/dev/isci/isci_io_request.c
  164. +34 −0 sys/dev/isci/isci_sysctl.c
  165. +11 −2 sys/dev/isci/isci_task_request.c
  166. +1 −0 sys/dev/iscsi/icl.c
  167. +95 −26 sys/dev/iscsi/iscsi.c
  168. +2 −1 sys/dev/ixgbe/ixgbe.c
  169. +1 −1 sys/dev/netmap/if_igb_netmap.h
  170. +0 −11 sys/dev/nvd/nvd.c
  171. +9 −3 sys/dev/nvme/nvme.c
  172. +2 −2 sys/dev/nvme/nvme.h
  173. +66 −6 sys/dev/nvme/nvme_ctrlr.c
  174. +224 −0 sys/dev/nvme/nvme_ns.c
  175. +4 −0 sys/dev/nvme/nvme_private.h
  176. +4 −4 sys/dev/nvme/nvme_test.c
  177. +2 −2 sys/dev/random/ivy.c
  178. +1 −0 sys/dev/xen/control/control.c
  179. +0 −2 sys/i386/ibcs2/ibcs2_sysvec.c
  180. +0 −3 sys/i386/include/xen/xen-os.h
  181. +37 −11 sys/kern/kern_descrip.c
  182. +5 −5 sys/kern/kern_mbuf.c
  183. +34 −11 sys/kern/uipc_sockbuf.c
  184. +2 −1 sys/kern/vfs_bio.c
  185. +2 −0 sys/kern/vfs_subr.c
  186. +3 −0 sys/mips/atheros/apb.c
  187. +12 −0 sys/mips/atheros/ar71xxreg.h
  188. +33 −0 sys/mips/atheros/ar934xreg.h
  189. +1 −1 sys/mips/conf/AR934X_BASE
  190. +5 −2 sys/mips/include/asm.h
  191. +8 −1 sys/mips/include/cpuregs.h
  192. +4 −0 sys/mips/mips/bus_space_generic.c
  193. +5 −4 sys/mips/mips/elf_trampoline.c
  194. +1 −0 sys/net/if.h
  195. +2 −1 sys/net/if_ethersubr.c
  196. +1 −0 sys/net/if_lagg.c
  197. +5 −2 sys/netinet/tcp_input.c
  198. +3 −0 sys/netinet6/in6_ifattach.c
  199. +0 −3 sys/ofed/drivers/infiniband/core/ucm.c
  200. +1 −34 sys/ofed/drivers/infiniband/hw/mlx4/main.c
  201. +1 −1 sys/ofed/include/rdma/ib_verbs.h
  202. +1 −1 sys/sys/param.h
  203. +2 −0 sys/sys/sockbuf.h
  204. +3 −5 sys/vm/vm_phys.c
  205. +25 −0 tools/build/mk/OptionalObsoleteFiles.inc
  206. +4 −0 tools/build/options/WITHOUT_RCS
  207. +2 −1 tools/regression/lib/libutil/Makefile
  208. +592 −0 tools/regression/lib/libutil/test-humanize_number.c
  209. +10 −0 tools/regression/lib/libutil/test-humanize_number.t
  210. +2 −2 usr.sbin/bhyve/Makefile
  211. +8 −15 usr.sbin/bhyve/bhyverun.c
  212. +0 −2 usr.sbin/bhyve/dbgport.h
  213. +11 −11 usr.sbin/bhyve/pci_ahci.c
  214. +12 −3 usr.sbin/bhyve/pci_emul.c
  215. +2 −2 usr.sbin/bhyvectl/Makefile
  216. +2 −2 usr.sbin/bhyveload/Makefile
  217. +20 −4 usr.sbin/bhyveload/bhyveload.8
  218. +5 −2 usr.sbin/bhyveload/bhyveload.c
  219. +3 −4 usr.sbin/bsdconfig/bsdconfig
  220. +1 −1 usr.sbin/bsdconfig/console/ttys
  221. +1 −1 usr.sbin/bsdconfig/mouse/enable
  222. +1 −1 usr.sbin/bsdconfig/networking/devices
  223. +8 −10 usr.sbin/bsdconfig/networking/share/device.subr
  224. +2 −2 usr.sbin/bsdconfig/networking/share/hostname.subr
  225. +5 −5 usr.sbin/bsdconfig/networking/share/ipaddr.subr
  226. +4 −4 usr.sbin/bsdconfig/networking/share/media.subr
  227. +4 −4 usr.sbin/bsdconfig/networking/share/netmask.subr
  228. +10 −9 usr.sbin/bsdconfig/networking/share/resolv.subr
  229. +5 −5 usr.sbin/bsdconfig/networking/share/routing.subr
  230. +1 −1 usr.sbin/bsdconfig/password/share/password.subr
  231. +2 −3 usr.sbin/bsdconfig/security/kern_securelevel
  232. +1 −1 usr.sbin/bsdconfig/security/security
  233. +4 −3 usr.sbin/bsdconfig/share/common.subr
  234. +6 −6 usr.sbin/bsdconfig/share/device.subr
  235. +12 −0 usr.sbin/bsdconfig/share/dialog.subr
  236. +2 −3 usr.sbin/bsdconfig/share/media/any.subr
  237. +1 −1 usr.sbin/bsdconfig/share/media/cdrom.subr
  238. +1 −1 usr.sbin/bsdconfig/share/media/common.subr
  239. +1 −1 usr.sbin/bsdconfig/share/media/dos.subr
  240. +1 −1 usr.sbin/bsdconfig/share/media/floppy.subr
  241. +3 −3 usr.sbin/bsdconfig/share/media/ftp.subr
  242. +2 −2 usr.sbin/bsdconfig/share/media/http.subr
  243. +1 −1 usr.sbin/bsdconfig/share/media/nfs.subr
  244. +2 −3 usr.sbin/bsdconfig/share/media/options.subr
  245. +18 −21 usr.sbin/bsdconfig/share/media/tcpip.subr
  246. +1 −1 usr.sbin/bsdconfig/share/media/ufs.subr
  247. +1 −1 usr.sbin/bsdconfig/share/media/usb.subr
  248. +4 −4 usr.sbin/bsdconfig/share/mustberoot.subr
  249. +11 −11 usr.sbin/bsdconfig/share/packages/packages.subr
  250. +3 −3 usr.sbin/bsdconfig/startup/misc
  251. +3 −3 usr.sbin/bsdconfig/startup/rcconf
  252. +4 −4 usr.sbin/bsdconfig/startup/rcdelete
  253. +1 −1 usr.sbin/bsdconfig/startup/rcvar
  254. +3 −3 usr.sbin/bsdconfig/startup/share/rcconf.subr
  255. +2 −2 usr.sbin/bsdconfig/startup/share/rcedit.subr
  256. +6 −6 usr.sbin/bsdconfig/timezone/timezone
  257. +1 −1 usr.sbin/bsdconfig/usermgmt/groupdel
  258. +1 −1 usr.sbin/bsdconfig/usermgmt/groupedit
  259. +8 −10 usr.sbin/bsdconfig/usermgmt/groupinput
  260. +13 −13 usr.sbin/bsdconfig/usermgmt/share/group_input.subr
  261. +35 −35 usr.sbin/bsdconfig/usermgmt/share/user_input.subr
  262. +1 −1 usr.sbin/bsdconfig/usermgmt/userdel
  263. +1 −1 usr.sbin/bsdconfig/usermgmt/useredit
  264. +4 −4 usr.sbin/bsdconfig/usermgmt/userinput
  265. +3 −4 usr.sbin/bsdconfig/usermgmt/usermgmt
  266. +3 −3 usr.sbin/ctladm/ctladm.c
  267. +1 −1 usr.sbin/ctld/kernel.c
  268. +3 −1 usr.sbin/ctld/login.c
  269. +2 −1 usr.sbin/iscsid/discovery.c
  270. +6 −4 usr.sbin/jail/jail.c
View
@@ -38,29 +38,8 @@
# xargs -n1 | sort | uniq -d;
# done
-# 20131015: removal of RCS from base
-OLD_FILES+=usr/bin/ci
-OLD_FILES+=usr/bin/co
-OLD_FILES+=usr/bin/ident
-OLD_FILES+=usr/bin/merge
-OLD_FILES+=usr/bin/rcs
-OLD_FILES+=usr/bin/rcsclean
-OLD_FILES+=usr/bin/rcsdiff
-OLD_FILES+=usr/bin/rcsfreeze
-OLD_FILES+=usr/bin/rcsmerge
-OLD_FILES+=usr/bin/rlog
-OLD_FILES+=usr/share/man/man1/ci.1.gz
-OLD_FILES+=usr/share/man/man1/co.1.gz
-OLD_FILES+=usr/share/man/man1/ident.1.gz
-OLD_FILES+=usr/share/man/man1/merge.1.gz
-OLD_FILES+=usr/share/man/man1/rcs.1.gz
-OLD_FILES+=usr/share/man/man1/rcsclean.1.gz
-OLD_FILES+=usr/share/man/man1/rcsdiff.1.gz
-OLD_FILES+=usr/share/man/man1/rcsfreeze.1.gz
-OLD_FILES+=usr/share/man/man1/rcsintro.1.gz
-OLD_FILES+=usr/share/man/man1/rcsmerge.1.gz
-OLD_FILES+=usr/share/man/man1/rlog.1.gz
-OLD_FILES+=usr/share/man/man5/rcsfile.5.gz
+# 20131009: freebsd-version moved from /libexec to /bin
+OLD_FILES+=/libexec/freebsd-version
# 20131001: ar and ranlib from binutils not used
OLD_FILES+=usr/bin/gnu-ar
OLD_FILES+=usr/bin/gnu-ranlib
View
@@ -16,8 +16,8 @@ from older versions of FreeBSD, try WITHOUT_CLANG to bootstrap to the tip of
head, and then rebuild without this option. The bootstrap process from
older version of current is a bit fragile.
-NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
- FreeBSD 10.x has many debugging features turned on, in both the kernel
+NOTE TO PEOPLE WHO THINK THAT FreeBSD 11.x IS SLOW:
+ FreeBSD 11.x has many debugging features turned on, in both the kernel
and userland. These features attempt to detect incorrect use of
system primitives, and encourage loud failure through extra sanity
checking and fail stop semantics. They also substantially impact
@@ -31,6 +31,25 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
disable the most expensive debugging functionality run
"ln -s 'abort:false,junk:false' /etc/malloc.conf".)
+20131010:
+ The rc.d/jail script has been updated to support jail(8)
+ configuration file. The "jail_<jname>_*" rc.conf(5) variables
+ for per-jail configuration are automatically converted to
+ /var/run/jail.<jname>.conf before the jail(8) utility is invoked.
+ This is transparently backward compatible. See below about some
+ incompatibilities and rc.conf(5) manual page for more details.
+
+ These variables are now deprecated in favor of jail(8) configuration
+ file. One can use "rc.d/jail config <jname>" command to generate
+ a jail(8) configuration file in /var/run/jail.<jname>.conf without
+ running the jail(8) utility. The default pathname of the
+ configuration file is /etc/jail.conf and can be specified by
+ using $jail_conf or $jail_<jname>_conf variables.
+
+ Please note that jail_devfs_ruleset accepts an integer at
+ this moment. Please consider to rewrite the ruleset name
+ with an integer.
+
20130930:
BIND has been removed from the base system. If all you need
is a local resolver, simply enable and start the local_unbound
@@ -73,19 +92,6 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 10.x IS SLOW:
has been updated to use this support. A new gcc is required to build
the aesni module on both i386 and amd64.
-20130827:
- Thomas Dickey (vendor author thereof) reports that dialog(1) since
- 2011/10/18 has a bug in handling --hline. Testers and I noticed the
- --hline is not ignored but displayed as a NULL string, regardless of
- value. This will cause confusion in some bsdconfig dialogs where the
- --hline is used to inform users which keybindings to use. This will
- likewise affect any other persons relying on --hline. It also looks
- rather strange seeing "[]" at the bottom of dialog(1) widgets when
- passing --hline "anything". Thomas said he will have a look in a few
- weeks. NOTE: The "[]" brackets appear with the left-edge where it
- would normally appear given the width of text to display, but the
- displayed text is not there (part of the bug).
-
20130821:
The PADLOCK_RNG and RDRAND_RNG kernel options are now devices.
Thus "device padlock_rng" and "device rdrand_rng" should be
View
@@ -15,6 +15,7 @@ SUBDIR= cat \
echo \
ed \
expr \
+ freebsd-version \
getfacl \
hostname \
kenv \
@@ -2,12 +2,11 @@
SCRIPTS = freebsd-version
MAN = freebsd-version.1
-BINDIR = /libexec
CLEANFILES = freebsd-version.sh
NEWVERS = ${.CURDIR}/../../sys/conf/newvers.sh
freebsd-version.sh.in: ${NEWVERS}
-freebsd-version.sh: freebsd-version.sh.in
+freebsd-version.sh: ${.CURDIR}/freebsd-version.sh.in
eval $$(egrep '^(TYPE|REVISION|BRANCH)=' ${NEWVERS}) ; \
if ! sed -e "\
s/@@TYPE@@/$${TYPE}/g; \
@@ -100,13 +100,13 @@ and the kernel.
.Sh EXAMPLES
To determine the version of the currently running userland:
.Bd -literal -offset indent
-/libexec/freebsd-version -u
+/bin/freebsd-version -u
.Ed
.Pp
To inspect a system being repaired using a live CD:
.Bd -literal -offset indent
mount -rt ufs /dev/ada0p2 /mnt
-env ROOT=/mnt /mnt/libexec/freebsd-version -ku
+env ROOT=/mnt /mnt/bin/freebsd-version -ku
.Ed
.Sh SEE ALSO
.Xr uname 1 ,
Oops, something went wrong.

0 comments on commit d9f76a0

Please sign in to comment.