summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStig Thormodsrud <stig@vyatta.com>2009-07-30 13:42:59 -0700
committerBob Gilligan <gilligan@vyatta.com>2009-07-30 13:58:46 -0700
commitc87c1a8bfa9a68dcc5c554ada1274ebcf44b5c2b (patch)
tree92c5b8b4aa7022790805a7f507838476364ae50a
parente5e5ef0458a2348fe60383d56ea7cc13e19f1da0 (diff)
downloadvyatta-cfg-system-c87c1a8bfa9a68dcc5c554ada1274ebcf44b5c2b.tar.gz
vyatta-cfg-system-c87c1a8bfa9a68dcc5c554ada1274ebcf44b5c2b.zip
Fix 4748: Pre-login message files (/etc/issue,/etc/issue.net) are
replaced with Debian branding during full-upgrade to Jenner (cherry picked from commit cbdcd18b2e5328d24a9dfe04dfa015f8375b50ac)
-rw-r--r--Makefile.am2
-rw-r--r--debian/vyatta-cfg-system.postinst.in6
-rw-r--r--sysconf/issue2
-rw-r--r--sysconf/issue.net1
4 files changed, 11 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index fc9c56c2..00327c24 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -55,6 +55,8 @@ bin_sudo_users_SCRIPTS += scripts/keepalived/vyatta-show-vrrp.pl
sysconf_DATA += sysconf/LICENSE
sysconf_DATA += sysconf/logrotate_messages
+sysconf_DATA += sysconf/issue
+sysconf_DATA += sysconf/issue.net
sysconf_DATA += sysconf/motd.tail
sysconf_DATA += sysconf/syslog.conf
sysconf_DATA += sysconf/ntp.conf
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index 38757106..a44fe657 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -109,6 +109,12 @@ EOF
# purge off ancient devfs stuff from /etc/securetty
cp $sysconfdir/securetty /etc/securetty
+
+ for f in issue issue.net; do
+ if [ ! -e /etc/$f.old ]; then
+ cp $sysconfdir/$f /etc/$f
+ fi
+ done
fi
# update crontab for logrotate
diff --git a/sysconf/issue b/sysconf/issue
new file mode 100644
index 00000000..f2618cff
--- /dev/null
+++ b/sysconf/issue
@@ -0,0 +1,2 @@
+Welcome to Vyatta - \n \l
+
diff --git a/sysconf/issue.net b/sysconf/issue.net
new file mode 100644
index 00000000..7f09caf6
--- /dev/null
+++ b/sysconf/issue.net
@@ -0,0 +1 @@
+Welcome to Vyatta