From e6e7dc57dc71495c40ee6937bff703c2c4a7f3ed Mon Sep 17 00:00:00 2001
From: Michael Larson <slioch@eng-140.vyatta.com>
Date: Mon, 30 Jun 2008 11:28:55 -0700
Subject: fix for bug 3400. user vyatta needed modification to discard command.

---
 etc/bash_completion.d/20vyatta-cfg | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'etc')

diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index f1d100e..a034937 100755
--- a/etc/bash_completion.d/20vyatta-cfg
+++ b/etc/bash_completion.d/20vyatta-cfg
@@ -75,9 +75,10 @@ discard ()
 	changes=0
     fi
 
-    sudo umount ${VYATTA_TEMP_CONFIG_DIR};
-    sudo rm -fr ${VYATTA_CHANGES_ONLY_DIR};
-    sudo mkdir -p ${VYATTA_CHANGES_ONLY_DIR};
+    sudo umount $VYATTA_TEMP_CONFIG_DIR
+    sudo rm -fr $VYATTA_CHANGES_ONLY_DIR $VYATTA_TEMP_CONFIG_DIR
+    make_vyatta_config_dir $VYATTA_CHANGES_ONLY_DIR
+    make_vyatta_config_dir $VYATTA_TEMP_CONFIG_DIR
     sudo mount -t unionfs -o dirs=${VYATTA_CHANGES_ONLY_DIR}=rw:${VYATTA_ACTIVE_CONFIGURATION_DIR}=ro unionfs ${VYATTA_TEMP_CONFIG_DIR};
     
     if (( changes )); then
-- 
cgit v1.2.3


From c90fc08925d58c10d0a462751d8ed51b90253eed Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Mon, 30 Jun 2008 14:33:50 -0700
Subject: add help string for "copy" and "rename"

---
 etc/bash_completion.d/20vyatta-cfg | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'etc')

diff --git a/etc/bash_completion.d/20vyatta-cfg b/etc/bash_completion.d/20vyatta-cfg
index a034937..3b523bd 100755
--- a/etc/bash_completion.d/20vyatta-cfg
+++ b/etc/bash_completion.d/20vyatta-cfg
@@ -814,22 +814,26 @@ vyatta_config_complete ()
 
   if (( ${#COMP_WORDS[@]} < 2 )); then
     declare -a hitems=( "commit" \
+                        "copy" \
                         "delete" \
-	                "discard" \
+                        "discard" \
                         "edit" \
                         "exit" \
                         "load" \
+                        "rename" \
                         "run" \
                         "save" \
                         "set" \
                         "show" )
     declare -a hstrs=( \
       "Commit the current set of changes" \
+      "Copy a configuration element" \
       "Delete a configuration element" \
       "Discard uncommitted changes" \
       "Edit a sub-element" \
       "Exit from this configuration level" \
       "Load configuration from a file" \
+      "Rename a configuration element" \
       "Run an operational-mode command" \
       "Save configuration to a file" \
       "Set the value of a parameter or create a new element" \
-- 
cgit v1.2.3


From 1277a4a911cf39e0e2200eea8ecbd483d1610f2f Mon Sep 17 00:00:00 2001
From: rbalocca <rbalocca@vyatta.com>
Date: Mon, 7 Jul 2008 17:00:55 -0700
Subject: Fix for bug http://bugzilla.vyatta.com/show_bug.cgi?id=3427

---
 etc/init.d/vyatta-ofr | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'etc')

diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 104903e..92acf45 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -118,6 +118,12 @@ start ()
     done
     load_bootfile
     chmod g-w,o-w /
+
+    (   [ -s /boot/grub/menu.lst ] &&
+	upgrade-from-grub-legacy &&
+	rm -f /boot/grub/menu.lst*
+    ) || true
+
     log_end_msg $?
 }
 
-- 
cgit v1.2.3