From 0f4eeefe3c2ee789836e7832b1c3ca0349df3200 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Wed, 13 Jul 2011 15:49:11 -0500 Subject: Bugfix 7326: add /config/support directory by default (cherry picked from commit 697affbbcbfaf8b8b253b3ce1a5f312db8069238) --- debian/vyatta-cfg-system.postinst.in | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 4648d29c..ac5618f5 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -170,6 +170,7 @@ mkdir -p /var/core mkdir -p /opt/vyatta/etc/config/auth mkdir -p /opt/vyatta/etc/config/scripts mkdir -p /opt/vyatta/etc/config/user-data +mkdir -p /opt/vyatta/etc/config/support # create /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script # this should be after 'mkdir -p /opt/vyatta/etc/config/scripts' above -- cgit v1.2.3 From d4d0574167b8fe45f7b1b87f8c95dc29a8b7a583 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Wed, 13 Jul 2011 15:56:08 -0500 Subject: 0.19.101 --- debian/changelog | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index cbeae26f..98618e90 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +vyatta-cfg-system (0.19.101) unstable; urgency=low + + [ Stephen Hemminger ] + * Fix duplicate detection of hypervisor + + [ John Southworth ] + * Bugfix 7326: add /config/support directory by default + + -- John Southworth Wed, 13 Jul 2011 15:56:08 -0500 + vyatta-cfg-system (0.19.100) unstable; urgency=low * new branch -- cgit v1.2.3 From 8598d47f23dd7adde408d384557e6f8d221681f9 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Fri, 12 Aug 2011 17:26:12 -0700 Subject: Add hook to call a config migration script when upgrading from VSE Demo. (cherry picked from commit d891558527fdc077b8c0b37c24cb8b17a2ae7043) --- 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 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 -- cgit v1.2.3 From 0c147f9583ec5afd9416c72012f2266096635183 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Fri, 12 Aug 2011 17:30:00 -0700 Subject: 0.19.102 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 98618e90..8db05875 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.19.102) unstable; urgency=low + + * Add hook to call a config migration script when upgrading from VSE + Demo. + + -- Bob Gilligan Fri, 12 Aug 2011 17:30:00 -0700 + vyatta-cfg-system (0.19.101) unstable; urgency=low [ Stephen Hemminger ] -- cgit v1.2.3 From 2b15723ca937e8d598617b7307501a99c48f992a Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Sun, 14 Aug 2011 16:36:23 -0700 Subject: Bugfix 7070: Need to provide full path for irq-affinity.pl in system() (cherry picked from commit c78c504b6a63b2af51ae02f51cf1c447dd945818) --- 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 a2f081f928c803317d884f88a786b12c0099c08c Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Sun, 14 Aug 2011 16:37:47 -0700 Subject: 0.19.103 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8db05875..2e13555f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.19.103) unstable; urgency=low + + * Bugfix 7070: Need to provide full path for irq-affinity.pl in + system() + + -- Bob Gilligan Sun, 14 Aug 2011 16:37:47 -0700 + vyatta-cfg-system (0.19.102) unstable; urgency=low * Add hook to call a config migration script when upgrading from VSE -- cgit v1.2.3 From 9d487369429b17bbde827fe42fbb2dc43485a8ed Mon Sep 17 00:00:00 2001 From: John Southworth Date: Fri, 15 Jul 2011 19:22:22 -0500 Subject: Fix permission problems on /config during initial install (cherry picked from commit 9b0151b1d51617e969807d75b00eed998bf8f294) --- debian/vyatta-cfg-system.postinst.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index ac5618f5..4e07288d 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -171,6 +171,8 @@ mkdir -p /opt/vyatta/etc/config/auth mkdir -p /opt/vyatta/etc/config/scripts mkdir -p /opt/vyatta/etc/config/user-data mkdir -p /opt/vyatta/etc/config/support +chown -R root.vyattacfg /opt/vyatta/etc/config +chmod -R 775 /opt/vyatta/etc/config # create /opt/vyatta/etc/config/scripts/vyatta-postconfig-bootup.script # this should be after 'mkdir -p /opt/vyatta/etc/config/scripts' above -- cgit v1.2.3 From 5492f1db3e89e116ba3520dbe78648f23aea4dc3 Mon Sep 17 00:00:00 2001 From: John Southworth Date: Fri, 15 Jul 2011 20:49:15 -0700 Subject: 0.19.104 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2e13555f..2704c974 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.19.104) unstable; urgency=low + + * Fix permission problems on /config during initial install + + -- John Southworth Fri, 15 Jul 2011 20:49:15 -0700 + vyatta-cfg-system (0.19.103) unstable; urgency=low * Bugfix 7070: Need to provide full path for irq-affinity.pl in -- cgit v1.2.3 From ec24d3c1bf563e0a14e2c36146a3071fed1756b1 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Wed, 17 Aug 2011 15:03:51 -0700 Subject: Bugfix 7350: Allow default config.boot to be selected as config file. Previously, the user could only select the running config file, which includes any changes the user may have made and saved, plus system generated changes such as the MAC addresses of ethernet interfaces. This change allows them to select that file or the system's default config file. --- scripts/install/install-postinst-new | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new index c96f5657..0f7a9b61 100755 --- a/scripts/install/install-postinst-new +++ b/scripts/install/install-postinst-new @@ -39,9 +39,16 @@ copy_config () { else # Find the config files and give the user the option to copy config files # TODO: this needs cleaned up - if [ -f "${VYATTA_CFG_DIR}/config.boot" ]; then - config=${VYATTA_CFG_DIR}/config.boot + + # First candidate: The config file on the running system. Note + # that this will include any changes made and saved by the user, + # as well as changes such as interface MAC addresses automatically + # generated by the user. So it is the first choice. + if [ -f "${VYATTA_NEW_CFG_DIR}/config.boot" ]; then + config=${VYATTA_NEW_CFG_DIR}/config.boot fi + + # Second candidate: The config file on floppy, if one exists. if [ -f "${FD_CFG_DIR}/config.boot" ]; then if [ -z "$config" ]; then config="${FD_CFG_DIR}/config.boot" @@ -50,10 +57,16 @@ copy_config () { fi fi + # Third candidate: The default config file + DEF_CONF=$vyatta_sysconfdir/config.boot.default + if [ -f $DEF_CONF ]; then + config="$config $DEF_CONF" + fi + if [ -n "$config" ]; then - echo "I found the following configuration files" + echo "I found the following configuration files:" for file in $config; do - echo $file + echo " $file" done default=$(echo -e $config | awk '{ print $1 }') @@ -64,7 +77,8 @@ copy_config () { done echo - cp -p $configfile $cfg_dir/ >&/dev/null + echo "Copying $configfile to $INSTALL_DRIVE." + cp -p $configfile $cfg_dir/config.boot >&/dev/null if [ $? != 0 ]; then lecho "Error copying file $configfile to config directory. Exiting..." exit 1 -- cgit v1.2.3 From 384ae6917b2d744b2557dda148b33e7e7adc0f48 Mon Sep 17 00:00:00 2001 From: Bob Gilligan Date: Wed, 17 Aug 2011 15:08:32 -0700 Subject: 0.19.105 --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2704c974..84272269 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +vyatta-cfg-system (0.19.105) unstable; urgency=low + + * Bugfix 7350: Allow default config.boot to be selected as config + file. + + -- Bob Gilligan Wed, 17 Aug 2011 15:08:32 -0700 + vyatta-cfg-system (0.19.104) unstable; urgency=low * Fix permission problems on /config during initial install -- cgit v1.2.3 From c95e6db8d6771c9ff7e2e61edd936adaba77b374 Mon Sep 17 00:00:00 2001 From: Deepti Kulkarni Date: Wed, 27 Jul 2011 07:58:49 -0700 Subject: Added to make "force" op-mode command accessible to user type operator. --- 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 4e07288d..0eb74858 100644 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -111,9 +111,11 @@ Cmnd_Alias DATE = /bin/date, /usr/sbin/ntpdate Cmnd_Alias PPPOE_CMDS = /sbin/pppd, /sbin/poff, /usr/sbin/pppstats Cmnd_Alias PCAPTURE = /usr/bin/tshark, /usr/bin/tcpdump Cmnd_Alias HWINFO = /usr/bin/lspci +Cmnd_Alias FORCE_CLUSTER = /usr/share/heartbeat/hb_takeover, \ + /usr/share/heartbeat/hb_standby %operator ALL=NOPASSWD: DATE, IPTABLES, ETHTOOL, IPFLUSH, HWINFO, \ PPPOE_CMDS, PCAPTURE, /usr/sbin/wanpipemon, \ - DISK, CONNTRACK, IP6TABLES + DISK, CONNTRACK, IP6TABLES, FORCE_CLUSTER EOF cat <>/etc/sudoers %users ALL=NOPASSWD: ${bindir}/sudo-users/ -- cgit v1.2.3 From 5c9468830faaad8976bf9739d250363aef171f40 Mon Sep 17 00:00:00 2001 From: Deepti Kulkarni Date: Wed, 27 Jul 2011 08:00:09 -0700 Subject: 0.19.106 --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 84272269..a7b07c9a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +vyatta-cfg-system (0.19.106) unstable; urgency=low + + * Added to make "force" op-mode command accessible to user type + + -- Deepti Kulkarni Wed, 27 Jul 2011 08:00:09 -0700 + vyatta-cfg-system (0.19.105) unstable; urgency=low * Bugfix 7350: Allow default config.boot to be selected as config -- cgit v1.2.3