Permalink
Browse files

templates: Make generated config consistent

This updates all the templates and the configuration files to consistently
use "key = value" everywhere.

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
  • Loading branch information...
1 parent 836676c commit eba7df9ee0a1963984ef212e7ddfc0e0835af288 @stgraber stgraber committed Dec 5, 2012
View
@@ -1,3 +1,3 @@
-lxc.network.type=veth
-lxc.network.link=virbr0
-lxc.network.flags=up
+lxc.network.type = veth
+lxc.network.link = virbr0
+lxc.network.flags = up
View
@@ -1,3 +1,3 @@
-lxc.network.type=veth
-lxc.network.link=lxcbr0
-lxc.network.flags=up
+lxc.network.type = veth
+lxc.network.link = lxcbr0
+lxc.network.flags = up
View
@@ -1 +1 @@
-lxc.network.type=empty
+lxc.network.type = empty
@@ -244,7 +244,7 @@ copy_configuration()
lxc.utsname = $name
lxc.tty = 4
lxc.pts = 1024
-lxc.mount = $config_path/fstab
+lxc.mount = $config_path/fstab
# When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined
@@ -461,4 +461,4 @@ if [ ! -z $clean ]; then
exit 0
fi
echo "container rootfs and config created"
-echo "container is configured for lxc.network.type=veth and lxc.network.link=virbr0 (which is default if you have libvirt runnig)"
+echo "network configured as $lxc_network_type in the $lxc_network_link"
View
@@ -220,20 +220,20 @@ function copy_configuration {
mkdir -p "${config_path}"
grep -q "^lxc.rootfs" "${config_path}/config" 2>/dev/null || echo "lxc.rootfs=${rootfs_path}" >> "${config_path}/config"
cat > "${config_path}/config" << EOF
-lxc.utsname=${name}
-lxc.tty=4
-lxc.pts=1024
-lxc.mount=${config_path}/fstab
+lxc.utsname = ${name}
+lxc.tty = 4
+lxc.pts = 1024
+lxc.mount = ${config_path}/fstab
# When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined
#networking
-lxc.network.type=${lxc_network_type}
-lxc.network.flags=up
-lxc.network.link=${lxc_network_link}
-lxc.network.name=eth0
-lxc.network.mtu=1500
+lxc.network.type = ${lxc_network_type}
+lxc.network.flags = up
+lxc.network.link = ${lxc_network_link}
+lxc.network.name = eth0
+lxc.network.mtu = 1500
#cgroups
lxc.cgroup.devices.deny = a
# /dev/null and zero
View
@@ -211,8 +211,8 @@ EOF
if [ -d "$rootfs/lib" ]; then
cat <<EOF >> $path/config
-lxc.mount.entry=/lib $rootfs/lib none ro,bind 0 0
-lxc.mount.entry=/usr/lib $rootfs/usr/lib none ro,bind 0 0
+lxc.mount.entry = /lib $rootfs/lib none ro,bind 0 0
+lxc.mount.entry = /usr/lib $rootfs/usr/lib none ro,bind 0 0
EOF
fi
@@ -224,7 +224,7 @@ fi
for dir in $libdirs; do
if [ -d "/$dir" ] && [ -d "$rootfs/$dir" ]; then
- echo "lxc.mount.entry=/$dir $dir none ro,bind 0 0" >> $path/config
+ echo "lxc.mount.entry = /$dir $dir none ro,bind 0 0" >> $path/config
fi
done
}
View
@@ -229,8 +229,8 @@ lxc.cgroup.devices.allow = c 5:2 rwm
lxc.cgroup.devices.allow = c 254:0 rwm
# mounts point
-lxc.mount.entry=proc proc proc nodev,noexec,nosuid 0 0
-lxc.mount.entry=sysfs sys sysfs defaults 0 0
+lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
+lxc.mount.entry = sysfs sys sysfs defaults 0 0
EOF
if [ $? -ne 0 ]; then
View
@@ -248,7 +248,7 @@ copy_configuration()
lxc.utsname = $name
lxc.tty = 4
lxc.pts = 1024
-lxc.mount = $config_path/fstab
+lxc.mount = $config_path/fstab
# When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined
View
@@ -204,8 +204,8 @@ lxc.cgroup.devices.allow = c 5:2 rwm
lxc.cgroup.devices.allow = c 254:0 rwm
# mounts point
-lxc.mount.entry=proc proc proc nodev,noexec,nosuid 0 0
-lxc.mount.entry=sysfs sys sysfs defaults 0 0
+lxc.mount.entry = proc proc proc nodev,noexec,nosuid 0 0
+lxc.mount.entry = sysfs sys sysfs defaults 0 0
EOF
if [ $? -ne 0 ]; then
@@ -260,7 +260,7 @@ lxc.utsname = $name
lxc.tty = 4
lxc.pts = 1024
-lxc.mount = $path/fstab
+lxc.mount = $path/fstab
# When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined
View
@@ -263,7 +263,7 @@ lxc.devttydir = lxc
lxc.tty = 4
lxc.pts = 1024
lxc.rootfs = $container_rootfs
-lxc.mount = $cfg_dir/fstab
+lxc.mount = $cfg_dir/fstab
# Networking
EOF
View
@@ -116,22 +116,22 @@ lxc.pts = 1024
# When using LXC with apparmor, uncomment the next line to run unconfined:
#lxc.aa_profile = unconfined
-lxc.mount.entry=/dev dev none ro,bind 0 0
-lxc.mount.entry=/lib lib none ro,bind 0 0
-lxc.mount.entry=/bin bin none ro,bind 0 0
-lxc.mount.entry=/usr usr none ro,bind 0 0
-lxc.mount.entry=/sbin sbin none ro,bind 0 0
-lxc.mount.entry=tmpfs var/run/sshd tmpfs mode=0644 0 0
-lxc.mount.entry=@LXCTEMPLATEDIR@/lxc-sshd sbin/init none bind 0 0
-lxc.mount.entry=proc $rootfs/proc proc nodev,noexec,nosuid 0 0
+lxc.mount.entry = /dev dev none ro,bind 0 0
+lxc.mount.entry = /lib lib none ro,bind 0 0
+lxc.mount.entry = /bin bin none ro,bind 0 0
+lxc.mount.entry = /usr usr none ro,bind 0 0
+lxc.mount.entry = /sbin sbin none ro,bind 0 0
+lxc.mount.entry = tmpfs var/run/sshd tmpfs mode=0644 0 0
+lxc.mount.entry = @LXCTEMPLATEDIR@/lxc-sshd sbin/init none bind 0 0
+lxc.mount.entry = proc $rootfs/proc proc nodev,noexec,nosuid 0 0
EOF
# if no .ipv4 section in config, then have the container run dhcp
grep -q "^lxc.network.ipv4" $path/config || touch $rootfs/run-dhcp
if [ "$(uname -m)" = "x86_64" ]; then
cat <<EOF >> $path/config
-lxc.mount.entry=/lib64 lib64 none ro,bind 0 0
+lxc.mount.entry = /lib64 lib64 none ro,bind 0 0
EOF
fi
}
View
@@ -331,7 +331,7 @@ lxc.utsname = $name
lxc.devttydir =$ttydir
lxc.tty = 4
lxc.pts = 1024
-lxc.mount = $path/fstab
+lxc.mount = $path/fstab
lxc.arch = $arch
lxc.cap.drop = sys_module mac_admin mac_override
lxc.pivotdir = lxc_putold
@@ -52,7 +52,7 @@ lxc.utsname = $name
lxc.tty = 4
lxc.pts = 1024
-lxc.mount = $path/fstab
+lxc.mount = $path/fstab
lxc.arch = $arch
lxc.cap.drop = sys_module mac_admin
lxc.pivotdir = lxc_putold

0 comments on commit eba7df9

Please sign in to comment.