From b66cc78521db17628efa3dd27766527816c170cc Mon Sep 17 00:00:00 2001
From: Kim Hagen <kim.sidney@gmail.com>
Date: Sat, 21 May 2016 11:48:25 -0400
Subject: T69 Remove floppy device settings

---
 scripts/install/install-functions    | 3 ---
 scripts/install/install-postinst-new | 9 ---------
 2 files changed, 12 deletions(-)

(limited to 'scripts/install')

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
-- 
cgit v1.2.3