X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai%2Fconfig%2Fbasefiles%2Fmk-basefile;h=3f539d8b782e44d0f1e489621a92c004652cea8d;hb=63372a0fd027649a0ef031efe5b7d22f396340d4;hp=6eb29dbf4a54e86c2b8aab8f07578572c37571bb;hpb=3bd65f0ca635f1349626c2393a4dd8a50df64f54;p=automated-distro-installer

diff --git a/fai/config/basefiles/mk-basefile b/fai/config/basefiles/mk-basefile
index 6eb29db..3f539d8 100755
--- a/fai/config/basefiles/mk-basefile
+++ b/fai/config/basefiles/mk-basefile
@@ -10,7 +10,7 @@
 
 # Supported distributions (each i386/amd64):
 # Debian GNU/Linux
-# Ubuntu 14.04
+# Ubuntu 14.04/16.04
 # CentOS 5/6/7
 # Scientific Linux Cern 5/6
 #
@@ -20,8 +20,8 @@
 
 # Define your local mirros here
 # For the first stage, set the CentOS/SLC mirror in /etc/rinse/rinse.conf
-MIRROR_DEBIAN=http://httpredir.debian.org/debian/
-MIRROR_DEBIAN=http://localmirror/debian/
+MIRROR_DEBIAN=http://http.us.debian.org/debian
+#MIRROR_DEBIAN=http://localmirror/debian/
 MIRROR_UBUNTU=http://mirror.netcologne.de/ubuntu/
 MIRROR_CENTOS=http://mirror.netcologne.de/
 #MIRROR_CENTOS=http://localmirror
@@ -31,6 +31,7 @@ EXCLUDE_SQUEEZE=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
 EXCLUDE_WHEEZY=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
 EXCLUDE_JESSIE=isc-dhcp-client,isc-dhcp-common,info,tasksel,tasksel-data
 EXCLUDE_TRUSTY=dhcp3-client,dhcp3-common,info
+EXCLUDE_XENIAL=isc-dhcp-client,isc-dhcp-common,udhcpc,dibbler-client,dhcpcd5,info,tasksel,tasksel-data
 
 INCLUDE_DEBIAN=aptitude
 
@@ -187,6 +188,16 @@ jessie() {
     tarit
 }
 
+stretch() {
+
+    local arch=$1
+
+    check
+    debootstrap --arch $arch --exclude=${EXCLUDE_JESSIE} --include=${INCLUDE_DEBIAN} stretch $xtmp ${MIRROR_DEBIAN}
+    cleanup-deb
+    tarit
+}
+
 trusty() {
 
     local arch=$1
@@ -197,6 +208,16 @@ trusty() {
     tarit
 }
 
+xenial() {
+
+    local arch=$1
+
+    check
+    debootstrap --arch $arch --exclude=${EXCLUDE_XENIAL} --include=${INCLUDE_DEBIAN} xenial $xtmp ${MIRROR_UBUNTU}
+    cleanup-deb
+    tarit
+}
+
 
 unknown() {
 
@@ -208,7 +229,9 @@ unknown() {
     CENTOS7_32   CENTOS7_64
     SLC5_32      SLC5_64
     SLC6_32      SLC6_64
+                 SLC7_64
     TRUSTY32     TRUSTY64
+    XENIAL32     XENIAL64
     SQUEEZE32    SQUEEZE64
     WHEEZY32     WHEEZY64
     JESSIE32     JESSIE64
@@ -251,14 +274,18 @@ case "$target" in
     SLC5_64) slc amd64 5 ;;
     SLC6_32) slc i386 6 ;;
     SLC6_64) slc amd64 6 ;;
+    SLC7_64) slc amd64 7 ;;
     TRUSTY32) trusty i386 ;;
     TRUSTY64) trusty amd64 ;;
+    XENIAL32) xenial i386 ;;
+    XENIAL64) xenial amd64 ;;
     SQUEEZE32) squeeze i386 ;;
     SQUEEZE64) squeeze amd64 ;;
     WHEEZY32) wheezy i386 ;;
     WHEEZY64) wheezy amd64 ;;
     JESSIE32) jessie i386 ;;
     JESSIE64) jessie amd64 ;;
+    STRETCH64) stretch amd64 ;;
     *) unknown ;;
 esac