[lxc-devel] [PATCH 2/4] Fix ubuntu template
Daniel Lezcano
dlezcano at fr.ibm.com
Tue Jun 1 16:57:46 UTC 2010
From: Daniel Lezcano <daniel.lezcano at free.fr>
- 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 at fr.ibm.com>
---
scripts/lxc-ubuntu.in | 16 +++++-----------
1 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/scripts/lxc-ubuntu.in b/scripts/lxc-ubuntu.in
index 592385e..835da0a 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
--
1.7.0.4
More information about the lxc-devel
mailing list