4 files changed, 4 insertions, 20 deletions
diff --git a/scripts/dns-forwarding/vyatta-dns-forwarding.pl b/scripts/dns-forwarding/vyatta-dns-forwarding.pl
index b1d912e5..b6b829b3 100755
--- a/scripts/dns-forwarding/vyatta-dns-forwarding.pl
+++ b/scripts/dns-forwarding/vyatta-dns-forwarding.pl
@@ -95,6 +95,10 @@ sub dnsforwarding_get_values {
         $output .= "cache-size=$cache_size\n";
     }
 
+    if (defined $query_all_servers) {
+        $output .= "all-servers\n";
+    }
+
     if (defined $ignore_hosts_file) {
         $output .= "no-hosts\n";
     }
diff --git a/scripts/install-system b/scripts/install-system
index 71fe0de1..108153da 100755
--- a/scripts/install-system
+++ b/scripts/install-system
@@ -46,7 +46,6 @@ MANUF=`/usr/sbin/dmidecode -s system-manufacturer`
 : ${vyatta_sysconfdir:=${vyatta_prefix}/etc}
 
 ofrconfdir=${vyatta_sysconfdir}/config
-fdconfdir=/media/floppy/config
 rootfsdir=/mnt/rootfs
 
 # By default this is not a union install
@@ -1037,13 +1036,6 @@ copy_config () {
     if [ -f $ofrconfdir/config.boot ]; then
 	config=$ofrconfdir/config.boot
     fi
-    if [ -f $fdconfdir/config.boot ]; then
-      if [ -z "$config" ]; then
-        config="$fdconfdir/config.boot"
-      else
-        config="$config $fdconfdir/config.boot"
-      fi
-    fi
 
     if [ -n "$config" ]; then
       echo "I found the following configuration files"
diff --git a/scripts/install/install-functions b/scripts/install/install-functions
index 85235f75..d241e040 100755
--- a/scripts/install/install-functions
+++ b/scripts/install/install-functions
@@ -43,9 +43,6 @@ CD_SQUASH_ROOT=/mnt/cdsquash
 VYATTA_CFG_DIR=${vyatta_sysconfdir}/config
 VYATTA_NEW_CFG_DIR=/config
 
-# the floppy config dir
-FD_CFG_DIR=/media/floppy/config
-
 # PROGRESS_PID can be exported by top-level script
 progress_indicator () {
   local spid=$PROGRESS_PID
diff --git a/scripts/install/install-postinst-new b/scripts/install/install-postinst-new
index 2a3bcde9..f6c6e956 100755
--- a/scripts/install/install-postinst-new
+++ b/scripts/install/install-postinst-new
@@ -51,15 +51,6 @@ copy_config () {
       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"
-      else
-        config="$config ${FD_CFG_DIR}/config.boot"
-      fi
-    fi
-
     # Third candidate: The default config file
     DEF_CONF=$vyatta_sysconfdir/config.boot.default
     if [ -f $DEF_CONF ]; then