Index: openacs-4/packages/acs-admin/www/server-restart.tcl
===================================================================
RCS file: /usr/local/cvsroot/openacs-4/packages/acs-admin/www/server-restart.tcl,v
diff -u -N -r1.4.24.1 -r1.4.24.2
--- openacs-4/packages/acs-admin/www/server-restart.tcl	10 Sep 2015 08:21:01 -0000	1.4.24.1
+++ openacs-4/packages/acs-admin/www/server-restart.tcl	21 May 2017 09:52:26 -0000	1.4.24.2
@@ -8,14 +8,27 @@
 }
 
 set page_title "Restarting Server"
-
 set context [list $page_title]
 
+#
+# When using NaviServer, and when the kernel parameter
+# "NsShutdownWithNonZeroExitCode" is set to be true, the "-restart"
+# option will be used.
+#
+if {[ns_info name] eq "NaviServer" &&
+    [parameter::get -parameter NsShutdownWithNonZeroExitCode -package_id $::acs::kernel_id -default 0]
+} {
+    set cmd {ns_shutdown -restart}
+} else {
+    set cmd ns_shutdown
+}
 
-# We do this as a schedule proc, so the server will have time to serve the page
+#
+# We perform the shutdown as a scheduled proc, so the server will have
+# time to serve the page.
+#
+ad_schedule_proc -thread t -once t 2 {*}$cmd
 
-ad_schedule_proc -thread t -once t 2 ns_shutdown
-
 # Local variables:
 #    mode: tcl
 #    tcl-indent-level: 4