From 9d487369429b17bbde827fe42fbb2dc43485a8ed Mon Sep 17 00:00:00 2001
From: John Southworth <john.southworth@vyatta.com>
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 <john.southworth@vyatta.com>
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 <john.southworth@vyatta.com>  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 <gilligan@vyatta.com>
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 <gilligan@vyatta.com>
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 <gilligan@vyatta.com>  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