verbose option for #1256

(cherry picked from commit a9b8f965)

src/etc/inc/system.inc

@@ -184,7 +184,7 @@ function system_resolvconf_generate($dynupdate = false)
 
     $fd = fopen('/etc/resolv.conf', 'w');
     if (!$fd) {
-        printf("Error: cannot open resolv.conf in system_resolvconf_generate().\n");
+        log_error('Cannot open resolv.conf in system_resolvconf_generate()');
         unlock($dnslock);
         return 1;
     }
@@ -759,7 +759,7 @@ function system_syslogd_extra_local($logsocket)
     return exec_safe('-l %s ', $logsocket);
 }
 
-function system_syslogd_start()
+function system_syslogd_start($verbose = false)
 {
     global $config, $g;
 
@@ -769,8 +769,10 @@ function system_syslogd_start()
     mwexec('/etc/rc.d/hostid start');
 
     $syslogcfg = $config['syslog'];
-    if (file_exists('/var/run/booting')) {
-        echo gettext('Starting syslog...');
+
+    if ($verbose) {
+        echo 'Starting syslog...';
+        flush();
     }
 
     $log_directive = '%';
@@ -860,7 +862,7 @@ EOD;
 
         /* write syslog.conf */
         if (!@file_put_contents("/var/etc/syslog.conf", $syslogconf)) {
-            printf(gettext("Error: cannot open syslog.conf in system_syslogd_start().%s"), "\n");
+            log_error('Cannot open syslog.conf in system_syslogd_start()');
             unset($syslogconf);
             return 1;
         }
@@ -904,8 +906,8 @@ EOD;
         mwexecf_bg("/usr/local/sbin/syslogd -s -c -c -P %s {$syslogd_extra}", '/var/run/syslog.pid');
     }
 
-    if (file_exists("/var/run/booting")) {
-        echo gettext("done.") . "\n";
+    if ($verbose) {
+        echo "done.\n";
     }
 }
 

src/etc/rc.bootup

@@ -134,7 +134,7 @@ system_hosts_generate();
 interfaces_loopback_configure();
 
 /* start syslogd */
-system_syslogd_start();
+system_syslogd_start(true);
 
 /* set up interfaces */
 mute_kernel_msgs();
@@ -253,7 +253,7 @@ prefer_ipv4_or_ipv6();
  * initialized, otherwise it can occasionally fail to
  * route syslog messages properly on both IPv4 and IPv6.
  */
-system_syslogd_start();
+system_syslogd_start(true);
 
 /* If there are ipsec dynamic hosts try again to reload the tunnels as rc.newipsecdns does */
 if ($ipsec_dynamic_hosts) {