summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorAdrian Gibanel Lopez <adrian.gibanel@btactic.com>2016-01-18 03:04:00 +0000
committerAdrian Gibanel Lopez <adrian.gibanel@btactic.com>2016-07-31 14:59:33 +0200
commit01a9df8ce325c5df9762f0db86128614b4d3476c (patch)
tree57df91a939cba964f60c4d21584b4649e1469e15 /functions
parent489a09ba92328cef846598a15329e9ff91519e3c (diff)
downloadvyos-live-build-01a9df8ce325c5df9762f0db86128614b4d3476c.tar.gz
vyos-live-build-01a9df8ce325c5df9762f0db86128614b4d3476c.zip
functions/default.sh : Define LB_PRIMARY_BOOTLOADER at the Set_defaults function which it's the right place where to do it
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh5
1 files changed, 2 insertions, 3 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index ddf4b1975..334984f7b 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -537,6 +537,8 @@ Set_defaults ()
esac
fi
+ LB_PRIMARY_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }')
+
# Setting checksums
case "${LB_MODE}" in
progress-linux)
@@ -845,9 +847,6 @@ Check_defaults ()
fi
fi
-
- LB_PRIMARY_BOOTLOADER=$(echo "${LB_BOOTLOADERS}" | awk -F, '{ print $1 }')
-
if [ "${LB_PRIMARY_BOOTLOADER}" = "syslinux" ]
then
# syslinux + fat or ntfs, or extlinux + ext[234] or btrfs