diff options
| author | John Southworth <john.southworth@vyatta.com> | 2011-07-15 19:22:35 -0500 |
|---|---|---|
| committer | John Southworth <john.southworth@vyatta.com> | 2011-07-15 19:22:35 -0500 |
| commit | 5227579fabde20725912d3b8e86aea781282fe46 (patch) | |
| tree | 2384e960113fcc0fd72a40c245bb879522f9d959 | |
| parent | 9b0151b1d51617e969807d75b00eed998bf8f294 (diff) | |
| parent | a233e40240f1c7125e7af6122c3041eba131e6e3 (diff) | |
| download | vyatta-cfg-system-5227579fabde20725912d3b8e86aea781282fe46.tar.gz vyatta-cfg-system-5227579fabde20725912d3b8e86aea781282fe46.zip | |
Merge branch 'napa' of git.vyatta.com:/git/vyatta-cfg-system into napa
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rwxr-xr-x | scripts/install/install-image-existing | 5 | ||||
| -rwxr-xr-x | scripts/vyatta-bonding.pl | 2 |
3 files changed, 20 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 95613688..94f53c98 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 + 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 diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index 94a0033b..7c75b35b 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -183,6 +183,8 @@ fi space_needed_configdata=`du -s ${VYATTA_NEW_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 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"; } } |