From: Daniel Lezcano <daniel.lezcano@free.fr>
Date: Tue, 1 Jun 2010 16:56:54 +0000 (+0200)
Subject: Fix ubuntu template
X-Git-Tag: lxc-0.7.0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3a3ba44ac3fe12ecbf098e1378a08aed06e39f17;p=thirdparty%2Flxc.git

Fix ubuntu template

 - Fixed rootfs path.
 - Removed network section, it should to be passed to the lxc-create
configuration option in order to concatenate the configuration files
 - Generate en_US local instead of de_DE

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/scripts/lxc-ubuntu.in b/scripts/lxc-ubuntu.in
index 592385e09..835da0a20 100644
--- a/scripts/lxc-ubuntu.in
+++ b/scripts/lxc-ubuntu.in
@@ -75,7 +75,7 @@ none            /lib/init/rw              tmpfs           mode=0755,nosuid,optio
 EOF
 
     # reconfigure some services
-    chroot $rootfs locale-gen de_DE.UTF-8
+    chroot $rootfs locale-gen en_US.UTF-8
 
     # remove pointless services in a container
     chroot $rootfs /usr/sbin/update-rc.d -f ondemand remove
@@ -86,9 +86,10 @@ EOF
     chroot $rootfs /bin/bash -c 'cd /etc/init; for f in $(ls hwclock*.conf); do echo $f; mv $f $f.orig; done'
     chroot $rootfs /bin/bash -c 'cd /etc/init; for f in $(ls module*.conf); do echo $f; mv $f $f.orig; done'
 
-    echo "Please change root-password !"
+    echo "root:root" | chroot $rootfs chpasswd
+    echo "Root password is 'root', please change !"
 
-    echo "root:root" | chroot /usr/local/var/lib/lxc/test/rootfs chpasswd
+    return 0
 }
 
 download_ubuntu()
@@ -181,16 +182,9 @@ copy_configuration()
     rootfs=$2
     name=$3
 
-    cat <<EOF > $path/config
-# Container with network virtualized using the macvlan device driver
+    cat <<EOF >> $path/config
 lxc.utsname = $name
 
-lxc.network.type = macvlan
-lxc.network.flags = up
-lxc.network.link = eth1
-lxc.network.hwaddr = 4a:49:43:49:79:03
-lxc.network.macvlan.mode = vepa
-
 lxc.tty = 4
 lxc.pts = 1024
 lxc.rootfs = $rootfs