From ac6e9bc699ae9ddb701763c05519da7f88b40120 Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Mon, 24 Mar 2008 18:10:05 -0700
Subject: Line up the colons with the one from the copyright notice (in show
 version)

---
 sysconf/version | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sysconf/version b/sysconf/version
index b0652ab0..cfcd9035 100644
--- a/sysconf/version
+++ b/sysconf/version
@@ -1 +1,2 @@
-Version :    VC4.0.1
+Version  :    VC4.0.1
+Copyright: 2006-2008 Vyatta, Inc.
-- 
cgit v1.2.3


From 15128e1a9877729275bbe10b51e7cf3efa6b7fa2 Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Mon, 24 Mar 2008 18:14:04 -0700
Subject: Set dependencies on either bash or vyatta-bash

---
 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index e73fa4bf..95214888 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Depends: sed (>= 4.1.5),
  coreutils (>= 5.97-5.3),
  libpam-radius-auth,
  vyatta-cfg,
- vyatta-bash,
+ vyatta-bash | bash (>= 3.1),
  sysv-rc,
  ntp,
  sysklogd,
-- 
cgit v1.2.3


From 1cdabf9a1200f4527486eb1ee3e21a0e99bf1441 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Tue, 25 Mar 2008 17:39:41 -0700
Subject: Bugfix: 3021 Allow operators to bring pppoe connections up and down.

---
 debian/vyatta-cfg-system.postinst.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in
index f3d53450..30cbfd5a 100644
--- a/debian/vyatta-cfg-system.postinst.in
+++ b/debian/vyatta-cfg-system.postinst.in
@@ -43,7 +43,9 @@ Cmnd_Alias IPFLUSH = /sbin/ip route flush cache, \
 		     /sbin/ip neigh flush dev *
 Cmnd_Alias ETHTOOLP = /usr/sbin/ethtool -p *
 Cmnd_Alias DATE    = /bin/date, /usr/sbin/ntpdate
-%operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH
+Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff
+%operator ALL=NOPASSWD: /sbin/reboot, DATE, IPTABLES, ETHTOOLP, IPFLUSH, \
+			PPPOE_CMDS
 EOF
 
     # for "users" level (FIXME)
-- 
cgit v1.2.3


From 721d32cfcd8330f06ef6aa8e6c8b5a2dba69436d Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Wed, 26 Mar 2008 12:20:14 -0700
Subject: Move the copyright dates over (bug 3028)

---
 sysconf/version | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysconf/version b/sysconf/version
index cfcd9035..5065006f 100644
--- a/sysconf/version
+++ b/sysconf/version
@@ -1,2 +1,2 @@
 Version  :    VC4.0.1
-Copyright: 2006-2008 Vyatta, Inc.
+Copyright:    2006-2008 Vyatta, Inc.
-- 
cgit v1.2.3


From 4e0f41dd1c43468310b554866a81c92e84e98995 Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Wed, 26 Mar 2008 12:33:27 -0700
Subject: fix for bug 3032: rename pre-glendale config files during
 install-system.

---
 scripts/install-system | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/install-system b/scripts/install-system
index 8d119087..2823746b 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -271,6 +271,16 @@ select_partition () {
   PARTITION=$lpartition
 }
 
+rename_old_config() {
+  files=$(find /mnt/config -mindepth 1 -type f | grep -v pre-glendale)
+  for f in $files; do
+    if grep -q '/\*XORP Configuration File, v1.0\*/' $f >&/dev/null; then
+      CURTIME=$(date +%F-%H%M%S)
+      mv $f $f.pre-glendale.$CURTIME
+    fi
+  done
+}
+
 ## check_config_partition
 # look to see if this partition contains a config file
 # and back it up
@@ -303,6 +313,7 @@ check_config_partition() {
             echo -e "Warning: error in copying the old config partition.\nSee $INSTALL_LOG for more details."
             echo -e "Warning: error in copying the old config partition.\ncp -pR /mnt/tmp/* /mnt/config\n$output\n" >> $INSTALL_LOG
           fi
+          rename_old_config
         fi
       done
     fi
-- 
cgit v1.2.3