From cbdcd18b2e5328d24a9dfe04dfa015f8375b50ac Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Thu, 30 Jul 2009 13:42:59 -0700
Subject: Fix 4748: Pre-login message files (/etc/issue,/etc/issue.net) are
 replaced with Debian branding during full-upgrade to Jenner

---
 Makefile.am                          | 2 ++
 debian/vyatta-cfg-system.postinst.in | 6 ++++++
 sysconf/issue                        | 2 ++
 sysconf/issue.net                    | 1 +
 4 files changed, 11 insertions(+)
 create mode 100644 sysconf/issue
 create mode 100644 sysconf/issue.net

diff --git a/Makefile.am b/Makefile.am
index 3d4de537..09be8be7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -54,6 +54,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
-- 
cgit v1.2.3


From 45c78c4f1f65df030b61c4645a17c444d156dbbb Mon Sep 17 00:00:00 2001
From: Stig Thormodsrud <stig@vyatta.com>
Date: Thu, 30 Jul 2009 13:43:58 -0700
Subject: 0.15.48+jenner44

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e07f7fa7..b42ad1fe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vyatta-cfg-system (0.15.48+jenner44) unstable; urgency=low
+
+  * Fix 4748: Pre-login message files (/etc/issue,/etc/issue.net) are
+
+ -- Stig Thormodsrud <stig@vyatta.com>  Thu, 30 Jul 2009 13:43:58 -0700
+
 vyatta-cfg-system (0.15.48+jenner43) unstable; urgency=low
 
   * fix undefined array ref
-- 
cgit v1.2.3