Permalink
Browse files

Merge branch 'releng/9.2' of github.com:freebsd/freebsd into releng/9.2

Conflicts:
	sys/boot/forth/beastie.4th
	sys/boot/forth/loader.rc
	sys/boot/forth/menu.4th
	sys/conf/newvers.sh
  • Loading branch information...
2 parents 3394e9b + 002b945 commit 793915cded83c7f353a36e4826e24c239f49dc76 @kmoore134 kmoore134 committed Aug 20, 2013
Showing with 2,324 additions and 1,205 deletions.
  1. +1 −1 contrib/libcxxrt/unwind-itanium.h
  2. +4 −0 contrib/sendmail/include/sm/os/sm_os_freebsd.h
  3. +1 −0 etc/Makefile
  4. +2 −0 etc/libmap.conf
  5. +66 −0 etc/namedb/named.conf
  6. +1 −1 release/Makefile.sysinstall
  7. +3 −0 release/ia64/mkisoimages.sh
  8. +1 −0 sys/boot/common/Makefile.inc
  9. +9 −6 sys/boot/common/part.c
  10. +108 −7 sys/boot/forth/beastie.4th
  11. +5 −4 sys/boot/forth/beastie.4th.8
  12. +1 −1 sys/boot/forth/brand.4th
  13. +1 −1 sys/boot/forth/brand.4th.8
  14. +28 −14 sys/boot/forth/check-password.4th
  15. +35 −19 sys/boot/forth/check-password.4th.8
  16. +9 −8 sys/boot/forth/color.4th
  17. +12 −13 sys/boot/forth/color.4th.8
  18. +1 −1 sys/boot/forth/delay.4th
  19. +1 −1 sys/boot/forth/delay.4th.8
  20. +16 −0 sys/boot/forth/frames.4th
  21. +13 −0 sys/boot/forth/loader.4th
  22. +1 −1 sys/boot/forth/loader.4th.8
  23. +1 −1 sys/boot/forth/loader.conf
  24. +18 −3 sys/boot/forth/loader.conf.5
  25. +0 −10 sys/boot/forth/loader.rc
  26. +219 −63 sys/boot/forth/menu-commands.4th
  27. +285 −237 sys/boot/forth/menu.4th
  28. +44 −15 sys/boot/forth/menu.4th.8
  29. +86 −40 sys/boot/forth/menu.rc
  30. +610 −0 sys/boot/forth/menusets.4th
  31. +372 −0 sys/boot/forth/menusets.4th.8
  32. +1 −1 sys/boot/forth/shortcuts.4th
  33. +40 −0 sys/boot/forth/support.4th
  34. +1 −1 sys/boot/forth/version.4th
  35. +8 −6 sys/boot/forth/version.4th.8
  36. +1 −1 sys/boot/i386/loader/Makefile
  37. +1 −1 sys/boot/ia64/common/Makefile
  38. +1 −1 sys/boot/pc98/loader/Makefile
  39. +1 −1 sys/boot/powerpc/ofw/Makefile
  40. +1 −1 sys/boot/powerpc/ps3/Makefile
  41. +1 −1 sys/boot/sparc64/loader/Makefile
  42. +1 −1 sys/conf/newvers.sh
  43. +37 −36 sys/dev/aac/aac_pci.c
  44. +4 −4 sys/dev/aac/aacvar.h
  45. +1 −7 sys/dev/aacraid/aacraid_pci.c
  46. +6 −9 sys/dev/advansys/adw_pci.c
  47. +2 −14 sys/dev/aic7xxx/ahc_pci.c
  48. +2 −13 sys/dev/aic7xxx/ahd_pci.c
  49. +1 −22 sys/dev/amr/amr_pci.c
  50. +0 −14 sys/dev/an/if_an_pci.c
  51. +1 −2 sys/dev/arcmsr/arcmsr.c
  52. +1 −3 sys/dev/asr/asr.c
  53. +1 −4 sys/dev/ata/ata-pci.c
  54. +1 −4 sys/dev/bktr/bktr_os.c
  55. +7 −12 sys/dev/buslogic/bt_pci.c
  56. +5 −11 sys/dev/dpt/dpt_pci.c
  57. +22 −24 sys/dev/e1000/if_em.c
  58. +29 −24 sys/dev/e1000/if_igb.c
  59. +1 −9 sys/dev/e1000/if_lem.c
  60. +2 −10 sys/dev/fatm/if_fatm.c
  61. +7 −1 sys/dev/filemon/filemon.c
  62. +1 −0 sys/dev/filemon/filemon_wrapper.c
  63. +1 −1 sys/dev/firewire/fwohci_pci.c
  64. +1 −1 sys/dev/fxp/if_fxp.c
  65. +1 −7 sys/dev/hatm/if_hatm.c
  66. +0 −11 sys/dev/ida/ida_pci.c
  67. +10 −15 sys/dev/ips/ips_pci.c
  68. +5 −7 sys/dev/isp/isp_pci.c
  69. +2 −2 sys/dev/iwn/if_iwn.c
  70. +2 −8 sys/dev/ixgb/if_ixgb.c
  71. +25 −17 sys/dev/ixgbe/ixgbe.c
  72. +12 −18 sys/dev/ixgbe/ixv.c
  73. +2 −14 sys/dev/mfi/mfi_pci.c
  74. +1 −11 sys/dev/mlx/mlx_pci.c
  75. +1 −15 sys/dev/mly/mly.c
  76. +2 −2 sys/dev/mn/if_mn.c
  77. +1 −13 sys/dev/mps/mps_pci.c
  78. +1 −6 sys/dev/mpt/mpt_pci.c
  79. +3 −30 sys/dev/mwl/if_mwl_pci.c
  80. +1 −4 sys/dev/mxge/if_mxge.c
  81. +1 −4 sys/dev/pccbb/pccbb_pci.c
  82. +1 −3 sys/dev/pst/pst-pci.c
  83. +0 −8 sys/dev/rp/rp_pci.c
  84. +2 −15 sys/dev/safe/safe.c
  85. +1 −4 sys/dev/sound/pci/als4000.c
  86. +1 −5 sys/dev/sound/pci/aureal.c
  87. +1 −5 sys/dev/sound/pci/cmi.c
  88. +1 −4 sys/dev/sound/pci/cs4281.c
  89. +1 −7 sys/dev/sound/pci/csa.c
  90. +1 −5 sys/dev/sound/pci/ds1.c
  91. +1 −5 sys/dev/sound/pci/emu10k1.c
  92. +0 −6 sys/dev/sound/pci/emu10kx.c
  93. +1 −5 sys/dev/sound/pci/envy24.c
  94. +1 −5 sys/dev/sound/pci/envy24ht.c
  95. +2 −7 sys/dev/sound/pci/es137x.c
  96. +1 −5 sys/dev/sound/pci/fm801.c
  97. +1 −16 sys/dev/sound/pci/hdspe.c
  98. +2 −7 sys/dev/sound/pci/maestro.c
  99. +1 −4 sys/dev/sound/pci/maestro3.c
  100. +2 −13 sys/dev/sound/pci/neomagic.c
  101. +1 −11 sys/dev/sound/pci/solo.c
  102. +2 −5 sys/dev/sound/pci/t4dwave.c
  103. +1 −5 sys/dev/sound/pci/via82c686.c
  104. +1 −4 sys/dev/sound/pci/vibes.c
  105. +2 −2 sys/dev/stge/if_stge.c
  106. +6 −12 sys/dev/sym/sym_hipd.c
  107. +0 −7 sys/dev/tdfx/tdfx_pci.c
  108. +1 −16 sys/dev/twa/tw_osl_freebsd.c
  109. +2 −15 sys/dev/tws/tws.c
  110. +2 −15 sys/dev/ubsec/ubsec.c
  111. +1 −11 sys/dev/wi/if_wi_pci.c
  112. +18 −1 sys/modules/ixgbe/Makefile
  113. +8 −0 sys/netinet/sctp_output.c
  114. +2 −2 sys/pci/ncr.c
  115. +3 −9 usr.sbin/bsdconfig/include/messages.subr
  116. +14 −45 usr.sbin/bsdconfig/share/media/ftp.subr
  117. +8 −40 usr.sbin/bsdinstall/scripts/mirrorselect
  118. +8 −3 usr.sbin/makefs/makefs.8
  119. +8 −2 usr.sbin/makefs/makefs.c
  120. +1 −0 usr.sbin/pkg_install/add/main.c
@@ -80,7 +80,7 @@ struct _Unwind_Exception
_Unwind_Exception_Cleanup_Fn exception_cleanup;
unsigned long private_1;
unsigned long private_2;
- } __attribute__((__aligned__));
+ };
extern _Unwind_Reason_Code _Unwind_RaiseException (struct _Unwind_Exception *);
extern _Unwind_Reason_Code _Unwind_ForcedUnwind (struct _Unwind_Exception *,
@@ -39,3 +39,7 @@
#ifndef SM_CONF_MSG
# define SM_CONF_MSG 1
#endif /* SM_CONF_MSG */
+
+#ifndef SM_IPNODEBYNAME_FLAGS
+# define SM_IPNODEBYNAME_FLAGS AI_DEFAULT|AI_ALL
+#endif /* SM_IPNODEBYNAME_FLAGS */
View
@@ -22,6 +22,7 @@ BIN1= crontab \
hosts.equiv \
inetd.conf \
libalias.conf \
+ libmap.conf \
login.access \
login.conf \
mac.conf \
View
@@ -0,0 +1,2 @@
+# $FreeBSD$
+includedir /usr/local/etc/libmap.d
View
@@ -153,6 +153,72 @@ zone "30.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
zone "31.172.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
zone "168.192.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+// Shared Address Space (RFC 6598)
+zone "64.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "65.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "66.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "67.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "68.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "69.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "70.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "71.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "72.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "73.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "74.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "75.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "76.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "77.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "78.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "79.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "80.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "81.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "82.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "83.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "84.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "85.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "86.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "87.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "88.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "89.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "90.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "91.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "92.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "93.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "94.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "95.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "96.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "97.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "98.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "99.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "100.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "101.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "102.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "103.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "104.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "105.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "106.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "107.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "108.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "109.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "110.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "111.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "112.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "113.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "114.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "115.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "116.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "117.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "118.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "119.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "120.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "121.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "122.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "123.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "124.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "125.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "126.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+zone "127.100.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
+
// Link-local/APIPA (RFCs 3927, 5735 and 6303)
zone "254.169.in-addr.arpa" { type master; file "/etc/namedb/master/empty.db"; };
@@ -24,7 +24,7 @@
# Set these, release builder!
#
# Fixed version:
-#BUILDNAME=9.2-RC1
+#BUILDNAME=9.2-RC2
#
# Automatic SNAP versioning:
DATE != date +%Y%m%d
@@ -63,10 +63,13 @@ if [ $bootable = yes ]; then
if [ -s $BASE/boot/mfsroot.gz ]; then
cp $BASE/boot/mfsroot.gz $MNT/boot
fi
+ cp $BASE/boot/color.4th $MNT/boot
cp $BASE/boot/support.4th $MNT/boot
cp $BASE/boot/check-password.4th $MNT/boot
cp $BASE/boot/screen.4th $MNT/boot
mv $MNT/boot/loader.efi $MNT/efi/boot/bootia64.efi
+ echo kern.cam.boot_delay=\"3000\" >> $MNT/boot/loader.conf
+ echo vfs.root.mountfrom=\"cd9660:iso9660/$LABEL\" >> $MNT/boot/loader.conf
umount $MNT
mdconfig -d -u $md
BOOTOPTS="-o bootimage=i386;$EFIPART -o no-emul-boot"
@@ -64,6 +64,7 @@ MAN+= ../forth/delay.4th.8
MAN+= ../forth/loader.conf.5
MAN+= ../forth/loader.4th.8
MAN+= ../forth/menu.4th.8
+MAN+= ../forth/menusets.4th.8
MAN+= ../forth/version.4th.8
.endif
View
@@ -181,7 +181,7 @@ gpt_checkhdr(struct gpt_hdr *hdr, uint64_t lba_self, uint64_t lba_last,
}
hdr->hdr_entries = le32toh(hdr->hdr_entries);
hdr->hdr_entsz = le32toh(hdr->hdr_entsz);
- if (hdr->hdr_entries < 128 ||
+ if (hdr->hdr_entries == 0 ||
hdr->hdr_entsz < sizeof(struct gpt_ent) ||
sectorsize % hdr->hdr_entsz != 0) {
DEBUG("invalid entry size or number of entries");
@@ -203,11 +203,14 @@ gpt_checktbl(const struct gpt_hdr *hdr, u_char *tbl, size_t size,
int i, cnt;
cnt = size / hdr->hdr_entsz;
- /* Check CRC only when buffer size is enough for table. */
- if (hdr->hdr_entries <= cnt &&
- crc32(tbl, size) != hdr->hdr_crc_table) {
- DEBUG("GPT table's CRC doesn't match");
- return (-1);
+ if (hdr->hdr_entries <= cnt) {
+ cnt = hdr->hdr_entries;
+ /* Check CRC only when buffer size is enough for table. */
+ if (hdr->hdr_crc_table !=
+ crc32(tbl, hdr->hdr_entries * hdr->hdr_entsz)) {
+ DEBUG("GPT table's CRC doesn't match");
+ return (-1);
+ }
}
ent = (struct gpt_ent *)tbl;
for (i = 0; i < cnt; i++, ent++) {
View
@@ -1,6 +1,6 @@
\ Copyright (c) 2003 Scott Long <scottl@freebsd.org>
\ Copyright (c) 2003 Aleksander Fafula <alex@fafula.com>
-\ Copyright (c) 2006-2011 Devin Teske <devinteske@hotmail.com>
+\ Copyright (c) 2006-2013 Devin Teske <dteske@FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,6 @@
marker task-beastie.4th
-include /boot/color.4th
include /boot/delay.4th
variable logoX
@@ -124,6 +123,76 @@ variable logoY
0 25 at-xy
;
+: tribute-art ( x y -- ) \ see tribute[bw]-logo
+
+ \ Disable the brand art (we're going to use that space)
+ s" set loader_brand=none" evaluate
+
+ \ Blank out the frame of the menu and move the title to left
+ s" set loader_menu_title=" evaluate
+ s" set loader_menu_frame=none" evaluate
+
+ \ Move the menu to the center of the screen
+ s" set loader_menu_x=26" evaluate
+ s" set loader_menu_y=13" evaluate
+ s" set loader_menu_timeout_x=21" evaluate
+ s" set loader_menu_timeout_y=24" evaluate
+
+ 2 - swap 39 - swap \ top-left (see `fbsdbw-logo' comments above)
+
+ 2dup at-xy 11 spaces ." ,d b." 1+
+ 2dup at-xy ." ,d88] [88b." 1+
+ 2dup at-xy ." ,d888P" 34 emit ." ,d88b. " 34 emit ." Y888b." 1+
+ 2dup at-xy ." , <888P" 34 emit ." ,dP" 34 emit ." ,db." 34 emit
+ ." Yb. " 34 emit ." Y888> ," 1+
+ 2dup at-xy ." <88b.~ ,d888 " 34 emit ." YP" 34 emit
+ ." 888b. ~,d88>" 1+
+ 2dup at-xy ." ," 34 emit ." Y888888P" 34 emit ." ,db.,db." 34 emit
+ ." Y888888P" 34 emit ." ," 1+
+ 2dup at-xy ." <88b." 34 emit ." YP" 34 emit ." _ " 34 emit
+ ." YP" 34 emit 34 emit ." YP" 34 emit ." _ " 34 emit
+ ." YP" 34 emit ." ,d88>" 1+
+ 2dup at-xy ." " 34 emit ." Y88b.,dP Yb.,d88P" 34 emit 1+
+ at-xy ." " 34 emit ." YP" 34 emit ." " 34 emit
+ ." YP" 34 emit ." "
+;
+
+: tribute-text ( x y -- ) \ see tribute[bw]-logo
+
+ swap 2 - swap \ beastie adjustment (see `fbsdbw-logo' comments above)
+
+ 2dup at-xy ." CEO Workstation" 1+
+ 1+
+ 2dup at-xy ." Nakatomi Socrates FreeBSD 9.2" 1+
+ 2dup at-xy ." Z-Level Central Core" 1+
+ 1+
+ at-xy ." Preliminary Clearance Approved."
+;
+
+: tribute-logo ( x y -- ) \ color Socrates tribute (16 rows x 32 columns)
+
+ \ Produce the tribute art in bright green
+ 2dup at-xy ." " 2dup tribute-art ." "
+
+ \ Produce the tribute text in regular green
+ 2dup at-xy ." " 2dup tribute-text ." "
+
+ \ Distinguish the ``Free'' in tribute-text
+ 2 + swap 16 + swap at-xy ." Free"
+
+ \ Put the cursor back at the bottom
+ 0 25 at-xy
+;
+
+: tributebw-logo ( x y -- ) \ Socrates tribute (16 rows x 32 columns)
+
+ \ Produce the tribute art and text
+ 2dup tribute-art tribute-text
+
+ \ Put the cursor back at the bottom
+ 0 25 at-xy
+;
+
: orb-logo ( x y -- ) \ color Orb mascot (15 rows x 30 columns)
3 + \ beastie adjustment (see `fbsdbw-logo' comments above)
@@ -181,9 +250,11 @@ variable logoY
\ NAME DESCRIPTION
\ beastie Color ``Helper Daemon'' mascot (19 rows x 34 columns)
\ beastiebw B/W ``Helper Daemon'' mascot (19 rows x 34 columns)
-\ fbsdbw "FreeNAS" logo in B/W (13 rows x 21 columns)
-\ orb Color ``Orb'' mascot (15 rows x 30 columns)
-\ orbbw B/W ``Orb'' mascot (15 rows x 32 columns) (default)
+\ fbsdbw "FreeBSD" logo in B/W (13 rows x 21 columns)
+\ orb Color ``Orb'' mascot (15 rows x 30 columns) (2nd default)
+\ orbbw B/W ``Orb'' mascot (15 rows x 32 columns)
+\ tribute Color ``Tribute'' (must fit 19 rows x 34 columns) (default)
+\ tributebw B/W ``Tribute'' (must fit 19 rows x 34 columns)
\
\ NOTE: Setting `loader_logo' to an undefined value (such as "none") will
\ prevent beastie from being drawn.
@@ -204,9 +275,21 @@ variable logoY
s" loader_logo" getenv dup -1 = if
logoX @ logoY @
loader_color? if
- orb-logo
+ s" tribute-logo"
+ sfind if
+ execute
+ else
+ drop
+ orb-logo
+ then
else
- orbbw-logo
+ s" tributebw-logo"
+ sfind if
+ execute
+ else
+ drop
+ orbbw-logo
+ then
then
drop exit
then
@@ -231,6 +314,24 @@ variable logoY
logoX @ logoY @ orbbw-logo
2drop exit
then
+ 2dup s" tribute" compare-insensitive 0= if
+ logoX @ logoY @
+ s" tribute-logo" sfind if
+ execute
+ else
+ orb-logo
+ then
+ 2drop exit
+ then
+ 2dup s" tributebw" compare-insensitive 0= if
+ logoX @ logoY @
+ s" tributebw-logo" sfind if
+ execute
+ else
+ orbbw-logo
+ then
+ 2drop exit
+ then
2drop
;
@@ -1,4 +1,4 @@
-.\" Copyright (c) 2011 Devin Teske
+.\" Copyright (c) 2011-2012 Devin Teske
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -94,8 +94,9 @@ The
variable can be configured in
.Xr loader.conf 5
to the number of seconds you would like to delay loading the boot menu.
-During the delay the user can press Ctrl-C to fall back to autoboot or ENTER
-to proceed.
+During the delay the user can press Ctrl-C to fall back to
+.Ic autoboot
+or ENTER to proceed.
The default behavior is to not delay.
.El
.Pp
@@ -168,4 +169,4 @@ set of commands was written by
.An Scott Long Aq scottl@FreeBSD.org ,
.An Aleksander Fafula Aq alex@fafula.com
and
-.An Devin Teske Aq devinteske@hotmail.com .
+.An Devin Teske Aq dteske@FreeBSD.org .
View
@@ -1,4 +1,4 @@
-\ Copyright (c) 2006-2011 Devin Teske <devinteske@hotmail.com>
+\ Copyright (c) 2006-2011 Devin Teske <dteske@FreeBSD.org>
\ All rights reserved.
\
\ Redistribution and use in source and binary forms, with or without
@@ -122,4 +122,4 @@ The
.Nm
set of commands was written by
.An -nosplit
-.An Devin Teske Aq devinteske@hotmail.com .
+.An Devin Teske Aq dteske@FreeBSD.org .
Oops, something went wrong.

0 comments on commit 793915c

Please sign in to comment.