Merge pull request #2583 from freenas/issues/70264

tkt-70264: Fix linebreak for motd
truenas · Feb 19, 2019 · 99e27c1 · 99e27c1
2 parents 322aebb + 1856881
commit 99e27c1
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/src/middlewared/middlewared/etc_files/motd b/src/middlewared/middlewared/etc_files/motd
@@ -1,3 +1,6 @@
+<%
+	motd = middleware.call_sync('system.advanced.config')['motd']
+%>\
 FreeBSD ?.?.?  (UNKNOWN)
 
 	FreeNAS (c) 2009-2019, The FreeNAS Development Team
@@ -6,4 +9,6 @@ FreeBSD ?.?.?  (UNKNOWN)
 
 	For more information, documentation, help or support, go here:
 	http://freenas.org
-${middleware.call_sync('system.advanced.config')['motd']}
+% if motd:
+${motd}
+% endif