summaryrefslogtreecommitdiff
path: root/functions
diff options
context:
space:
mode:
authorDaniel Baumann <daniel@debian.org>2011-02-14 12:29:25 +0100
committerDaniel Baumann <daniel@debian.org>2011-03-09 19:20:43 +0100
commit90b145de6c20829d6d20e7b89ade11e34029f56f (patch)
tree3407caef8b8b0b3b1583879236dc28f721053213 /functions
parent0762a8e56e8ad79ce3a3884aa0743ee459362ad4 (diff)
downloadvyos-live-build-90b145de6c20829d6d20e7b89ade11e34029f56f.tar.gz
vyos-live-build-90b145de6c20829d6d20e7b89ade11e34029f56f.zip
Adding initial support for parent distribution for debian-installer.
Diffstat (limited to 'functions')
-rwxr-xr-xfunctions/defaults.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 5f266158c..44245f3b8 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -37,16 +37,19 @@ Set_defaults ()
case "${LB_DISTRIBUTION}" in
artax|artax-backports)
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
+ LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
;;
baureo)
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}"
+ LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
;;
esac
;;
*)
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-${LB_DISTRIBUTION}}"
+ LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
;;
esac
@@ -810,8 +813,7 @@ Set_defaults ()
;;
esac
- # Setting debian-installer distribution
- LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}"
+ LB_DEBIAN_INSTALLER_DISTRIBUTION="${LB_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_DISTRIBUTION}}"
# Setting debian-installer-gui
case "${LB_MODE}" in