From: Christian Hofstaedtler <ch@grml.org>
Date: Tue, 23 Nov 2010 11:51:59 +0000 (+0100)
Subject: fcopy motd instead of relying on grml-etc plus weirdness
X-Git-Tag: v0.12.0~14
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=1455f914da3d0cf8a96ecb78261e9d6f8d8610cc

fcopy motd instead of relying on grml-etc plus weirdness
---

diff --git a/etc/grml/fai/config/files/etc/motd/GRMLBASE b/etc/grml/fai/config/files/etc/motd/GRMLBASE
new file mode 100644
index 0000000..1fc6f73
--- /dev/null
+++ b/etc/grml/fai/config/files/etc/motd/GRMLBASE
@@ -0,0 +1,2 @@
+grml - Linux for geeks
+
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/31-motd b/etc/grml/fai/config/scripts/GRMLBASE/31-motd
index 3093e64..a83dfe9 100755
--- a/etc/grml/fai/config/scripts/GRMLBASE/31-motd
+++ b/etc/grml/fai/config/scripts/GRMLBASE/31-motd
@@ -1,6 +1,6 @@
 #!/bin/bash
 # Filename:      /etc/grml/fai/config/scripts/GRMLBASE/31-motd
-# Purpose:       make sure the motd setup is correct
+# Purpose:       replace motd
 # Authors:       grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
 # Bug-Reports:   see http://grml.org/bugs/
 # License:       This file is licensed under the GPL v2 or any later version.
@@ -9,9 +9,7 @@
 set -u
 set -e
 
-if [ -f $target/etc/motd.dpkg-new ] ; then
-   $ROOTCMD mv /etc/motd.dpkg-new /var/run/motd
-fi
+fcopy /etc/motd
 
 ## END OF FILE #################################################################
 # vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=3