From 5a0235caa1600f4ea9601edcbfedab48b837174e Mon Sep 17 00:00:00 2001 From: Renato Botelho Date: Tue, 3 May 2016 17:09:01 -0300 Subject: Show patchlevel together with product version on banners and system information widget --- src/etc/rc.banner | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'src/etc/rc.banner') diff --git a/src/etc/rc.banner b/src/etc/rc.banner index 6204d29..fbd4ba0 100755 --- a/src/etc/rc.banner +++ b/src/etc/rc.banner @@ -34,17 +34,21 @@ require_once("gwlb.inc"); require_once("interfaces.inc"); - $platform = trim(file_get_contents("{$g['etc_path']}/platform")); $hostname = $config['system']['hostname']; $product = $g['product_name']; $machine = trim(`uname -m`); $hideplatform = $g['hideplatform']; if (!$hideplatform) { - $platformbanner = "-{$platform}"; + if ($g['platform'] == $g['product_name']) { + $platform = "full-install"; + } else { + $platform = $g['platform']; + } + $platformbanner = " {$platform}"; } - print "*** Welcome to {$product} {$g['product_version']}{$platformbanner} ({$machine}) on {$hostname} ***\n"; + print "*** Welcome to {$product} {$g['product_version_string']} ({$machine}{$platformbanner}) on {$hostname} ***\n"; $iflist = get_configured_interface_with_descr(false, true); foreach ($iflist as $ifname => $friendly) { -- cgit v1.1