From cfab2a619d148cb1aeb3569e18fdff711c711cb1 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Thu, 22 May 2014 15:11:39 -0500
Subject: [PATCH] chroot: use sane defaults for deb_components & deb_mirror,
when not set
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
---
scripts/chroot.sh | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/scripts/chroot.sh b/scripts/chroot.sh
index 3f002aa68..fb00d1dbe 100755
--- a/scripts/chroot.sh
+++ b/scripts/chroot.sh
@@ -56,27 +56,16 @@ check_defines () {
apt_proxy=""
fi
- if [ ! "${deb_mirror}" ] ; then
- case "${deb_distribution}" in
- debian)
- deb_mirror="ftp.us.debian.org/debian/"
- ;;
- ubuntu)
- deb_mirror="ports.ubuntu.com/ubuntu-ports/"
- ;;
- esac
- fi
-
- if [ ! "${deb_components}" ] ; then
- case "${deb_distribution}" in
- debian)
- deb_components="main contrib non-free"
- ;;
- ubuntu)
- deb_components="main universe multiverse"
- ;;
- esac
- fi
+ case "${deb_distribution}" in
+ debian)
+ deb_components=${deb_components:-"main contrib non-free"}
+ deb_mirror=${deb_mirror:-"ftp.us.debian.org/debian/"}
+ ;;
+ ubuntu)
+ deb_components=${deb_components:-"main universe multiverse"}
+ deb_mirror=${deb_mirror:-"ports.ubuntu.com/ubuntu-ports/"}
+ ;;
+ esac
if [ ! "${rfs_username}" ] ; then
##Backwards compat pre variables.txt doc
--
GitLab