diff options
| author | Kim Hagen <kim.sidney@gmail.com> | 2016-05-21 11:48:25 -0400 |
|---|---|---|
| committer | Kim Hagen <kim.sidney@gmail.com> | 2016-05-21 11:48:25 -0400 |
| commit | b66cc78521db17628efa3dd27766527816c170cc (patch) | |
| tree | 097df409c31a6a9b04484701d65a551df8dcd810 | |
| parent | b4be922411d61216aca52202ec3ee432551a4f89 (diff) | |
| download | vyatta-cfg-system-b66cc78521db17628efa3dd27766527816c170cc.tar.gz vyatta-cfg-system-b66cc78521db17628efa3dd27766527816c170cc.zip | |
T69 Remove floppy device settings
| -rwxr-xr-x | scripts/install-system | 8 | ||||
| -rwxr-xr-x | scripts/install/install-functions | 3 | ||||
| -rwxr-xr-x | scripts/install/install-postinst-new | 9 |
3 files changed, 0 insertions, 20 deletions
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 |