From d891558527fdc077b8c0b37c24cb8b17a2ae7043 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Fri, 12 Aug 2011 17:26:12 -0700
Subject: Add hook to call a config migration script when upgrading from VSE
 Demo.

---
 scripts/install/install-image-existing | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing
index 13af9bf8..d75a62b6 100755
--- a/scripts/install/install-image-existing
+++ b/scripts/install/install-image-existing
@@ -183,6 +183,8 @@ fi
 space_needed_configdata=`du -s ${VYATTA_CFG_DIR} | awk  '{ print $1 }'`
 space_needed_config=$(($space_needed_configdata - $space_needed_data))
 
+DEMO_MIGRATE_SCRIPT=/opt/vyatta/sbin/demo-to-vse.pl
+
 # save current config dir if needed
 if [ $space_avail -gt $space_needed_configdata ]; then
   resp=''
@@ -198,6 +200,9 @@ if [ $space_avail -gt $space_needed_configdata ]; then
         -exec cp '-a' '{}' "$ndir/" ';'
       chgrp -R vyattacfg $ndir
       chmod -R 775 $ndir
+      if [ -x $DEMO_MIGRATE_SCRIPT ]; then
+	  $DEMO_MIGRATE_SCRIPT $ndir/config.boot
+      fi
     fi
   done
 else
-- 
cgit v1.2.3


From c204a6e6e98f0af260c2b91303da0a5e8cd60fdc Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Fri, 12 Aug 2011 17:27:38 -0700
Subject: 0.19.99+napa3

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

diff --git a/debian/changelog b/debian/changelog
index 95613688..1f776eb0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-system (0.19.99+napa3) unstable; urgency=low
+
+  * Add hook to call a config migration script when upgrading from VSE
+    Demo.
+
+ -- Bob Gilligan <gilligan@vyatta.com>  Fri, 12 Aug 2011 17:27:37 -0700
+
 vyatta-cfg-system (0.19.99+napa2) unstable; urgency=low
 
   * Bugfix 7326: add /config/support directory by default
-- 
cgit v1.2.3


From c78c504b6a63b2af51ae02f51cf1c447dd945818 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Sun, 14 Aug 2011 16:36:23 -0700
Subject: Bugfix 7070: Need to provide full path for irq-affinity.pl in
 system()

---
 scripts/vyatta-bonding.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/vyatta-bonding.pl b/scripts/vyatta-bonding.pl
index 8cd8d5f0..eac89f07 100755
--- a/scripts/vyatta-bonding.pl
+++ b/scripts/vyatta-bonding.pl
@@ -155,7 +155,7 @@ sub if_up {
 
     my $smp_affinity = get_irq_affinity($intf);
     if ($smp_affinity) {
-	system "irq-affinity.pl $intf $smp_affinity"
+	system "/opt/vyatta/sbin/irq-affinity.pl $intf $smp_affinity"
 	    and warn "Could not set $intf smp_affinity $smp_affinity\n";
     }
 }
-- 
cgit v1.2.3


From a233e40240f1c7125e7af6122c3041eba131e6e3 Mon Sep 17 00:00:00 2001
From: Bob Gilligan <gilligan@vyatta.com>
Date: Sun, 14 Aug 2011 16:37:00 -0700
Subject: 0.19.99+napa4

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

diff --git a/debian/changelog b/debian/changelog
index 1f776eb0..94f53c98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+vyatta-cfg-system (0.19.99+napa4) unstable; urgency=low
+
+  * Bugfix 7070: Need to provide full path for irq-affinity.pl in
+    system()
+
+ -- Bob Gilligan <gilligan@vyatta.com>  Sun, 14 Aug 2011 16:36:59 -0700
+
 vyatta-cfg-system (0.19.99+napa3) unstable; urgency=low
 
   * Add hook to call a config migration script when upgrading from VSE
-- 
cgit v1.2.3