X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lbuild-initvm.sh;h=85c1f82a73baaa894214093787338c19ef19caa3;hb=21c97c89145ce71787a8df492e2b2c6323bab67c;hp=f37f419be029df6b9c15e403ae07970e9e622702;hpb=7dd49f795015387df7b7e85a33b2216bbe326d29;p=build.git

diff --git a/lbuild-initvm.sh b/lbuild-initvm.sh
index f37f419b..85c1f82a 100755
--- a/lbuild-initvm.sh
+++ b/lbuild-initvm.sh
@@ -73,7 +73,7 @@ function package_method () {
     fcdistro=$1; shift
     case $fcdistro in
 	f[0-9]*|centos[0-9]*|sl[0-9]*) echo yum ;;
-	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty) echo debootstrap ;;
+	squeeze|wheezy|jessie|oneiric|precise|quantal|raring|saucy|trusty|utopic) echo debootstrap ;;
 	*) echo Unknown distro $fcdistro ;;
     esac 
 }
@@ -368,7 +368,7 @@ function debian_mirror () {
     case $fcdistro in
 	squeeze|wheezy|jessie) 
 	    echo http://ftp2.fr.debian.org/debian/ ;;
-	oneiric|precise|quantal|raring|saucy|trusty) 
+	oneiric|precise|quantal|raring|saucy|trusty|utopic) 
 	    echo http://mir1.ovh.net/ubuntu/ubuntu/ ;;
 	*) echo unknown distro $fcdistro; exit 1;;
     esac
@@ -453,9 +453,11 @@ function setup_lxc() {
     # Enable cgroup -- xxx -- is this really useful ?
     [ -d $lxc_root/cgroup ] || mkdir $lxc_root/cgroup
     
-    # set up resolv.conf
+    ### set up resolv.conf from host
+    # ubuntu precise and on, /etc/resolv.conf is a symlink to ../run/resolvconf/resolv.conf
+    [ -h $lxc_root/etc/resolv.conf ] && rm -f $lxc_root/etc/resolv.conf
     cp /etc/resolv.conf $lxc_root/etc/resolv.conf
-    # and /etc/hosts for at least localhost
+    ### and /etc/hosts for at least localhost
     [ -f $lxc_root/etc/hosts ] || echo "127.0.0.1 localhost localhost.localdomain" > $lxc_root/etc/hosts
     
     # grant ssh access from host to guest