rc: shuffle newlines around a wee bit too (#32)

src/etc/rc

@@ -386,8 +386,6 @@ fi
 # Reset the cache.  read-only requires this.
 /bin/rm -f /tmp/config.cache
 
-echo
-
 /usr/local/etc/rc.initial.banner
 
 exit 0

src/etc/rc.initial

@@ -23,11 +23,11 @@ if [ -n "${*}" ]; then
 	exit ${?}
 fi
 
+echo
+
 # endless loop
 while : ; do
 
-echo
-
 # If we are on the install media advertise that fact
 if _tmpdir=$(mktemp -d -q /.diskless.XXXXXX); then
 	rmdir ${_tmpdir}

src/etc/rc.initial.banner

@@ -38,7 +38,7 @@ $hostname = $config['system']['hostname'];
 $product = $g['product_name'];
 $machine = trim(`uname -m`);
 
-print "*** Welcome to {$product} {$version} ({$machine}) on {$hostname} ***\n";
+print "\n*** Welcome to {$product} {$version} ({$machine}) on {$hostname} ***\n";
 
 $iflist = get_configured_interface_with_descr(false, true);
 foreach($iflist as $ifname => $friendly) {

src/etc/rc.initial.firmware_update

@@ -39,18 +39,19 @@ case ${YN} in
 	;;
 esac
 
-trap : 2
-trap : 3
+echo
 
 # upgrade all packages if possible
 pkg upgrade -y
 
+echo
+
 # refresh the php.ini files now rather than later
 /usr/local/etc/rc.php_ini_setup
 
+echo
+
 # if we can update base, we'll do that as well
 if opnsense-update -c; then
-	opnsense-update && reboot
+	opnsense-update && /usr/local/etc/rc.reboot
 fi
-
-echo