Date: Thu, 29 Aug 2013 15:29:48 +0000 (UTC) From: Devin Teske <dteske@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-releng@freebsd.org Subject: svn commit: r255027 - releng/9.2/sys/boot/forth Message-ID: <201308291529.r7TFTmSk003744@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dteske Date: Thu Aug 29 15:29:48 2013 New Revision: 255027 URL: http://svnweb.freebsd.org/changeset/base/255027 Log: MFS9 r254953, itself an MFC of r254942 and r254952: Make alternate layout ``opt-in'' and add support for named releases. Minor edit to version.4th(8) manual and stack-leak fixes while here. Approved by: re (gjb) Modified: releng/9.2/sys/boot/forth/beastie.4th releng/9.2/sys/boot/forth/version.4th releng/9.2/sys/boot/forth/version.4th.8 Directory Properties: releng/9.2/sys/ (props changed) releng/9.2/sys/boot/ (props changed) releng/9.2/sys/boot/forth/ (props changed) Modified: releng/9.2/sys/boot/forth/beastie.4th ============================================================================== --- releng/9.2/sys/boot/forth/beastie.4th Thu Aug 29 15:24:04 2013 (r255026) +++ releng/9.2/sys/boot/forth/beastie.4th Thu Aug 29 15:29:48 2013 (r255027) @@ -134,7 +134,7 @@ variable logoY \ 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_y=12" evaluate s" set loader_menu_timeout_x=21" evaluate s" set loader_menu_timeout_y=24" evaluate @@ -275,21 +275,9 @@ variable logoY s" loader_logo" getenv dup -1 = if logoX @ logoY @ loader_color? if - s" tribute-logo" - sfind if - execute - else - drop - orb-logo - then + orb-logo else - s" tributebw-logo" - sfind if - execute - else - drop - orbbw-logo - then + orbbw-logo then drop exit then @@ -319,7 +307,7 @@ variable logoY s" tribute-logo" sfind if execute else - orb-logo + drop orb-logo then 2drop exit then @@ -328,7 +316,7 @@ variable logoY s" tributebw-logo" sfind if execute else - orbbw-logo + drop orbbw-logo then 2drop exit then Modified: releng/9.2/sys/boot/forth/version.4th ============================================================================== --- releng/9.2/sys/boot/forth/version.4th Thu Aug 29 15:24:04 2013 (r255026) +++ releng/9.2/sys/boot/forth/version.4th Thu Aug 29 15:29:48 2013 (r255027) @@ -1,4 +1,4 @@ -\ Copyright (c) 2006-2011 Devin Teske <dteske@FreeBSD.org> +\ Copyright (c) 2006-2013 Devin Teske <dteske@FreeBSD.org> \ All rights reserved. \ \ Redistribution and use in source and binary forms, with or without @@ -29,6 +29,9 @@ marker task-version.4th variable versionX variable versionY +\ Default $loader_version value if not overridden or using tribute screen +: str_loader_version ( -- C-ADDR/U|-1 ) s" FreeBSD `Nakatomi Socrates' 9.2" ; + \ Initialize text placement to defaults 80 versionX ! \ NOTE: this is the ending column (text is right-justified) 24 versionY ! @@ -43,9 +46,33 @@ variable versionY ?number drop versionY ! -1 then drop - \ Exit if a version was not set + \ Default version if none was set s" loader_version" getenv dup -1 = if - drop exit + drop + \ Default version if no logo is requested + s" loader_logo" getenv dup -1 = if + drop str_loader_version + else + 2dup s" tribute" compare-insensitive 0= if + 2drop + s" tribute-logo" sfind if + drop exit \ see beastie tribute-text + else + drop str_loader_version + then + else 2dup s" tributebw" compare-insensitive 0= if + 2drop + s" tributebw-logo" sfind if + drop exit \ see beastie tribute-text + else + drop str_loader_version + then + else + 2drop str_loader_version + then then + then + then dup -1 = if + drop exit \ default version (above) is disabled then \ Right justify the text Modified: releng/9.2/sys/boot/forth/version.4th.8 ============================================================================== --- releng/9.2/sys/boot/forth/version.4th.8 Thu Aug 29 15:24:04 2013 (r255026) +++ releng/9.2/sys/boot/forth/version.4th.8 Thu Aug 29 15:29:48 2013 (r255027) @@ -91,7 +91,7 @@ causes the version to be printed without .Pq default is ANSI Cyan . .El .Sh FILES -.Bl -tag -width /boot/loader.4th -compact +.Bl -tag -width /boot/version.4th -compact .It Pa /boot/loader The .Xr loader 8 .
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201308291529.r7TFTmSk003744>