This updates all the templates and the configuration files to consistently
use "key = value" everywhere.
Signed-off-by: Stéphane Graber <stgra...@ubuntu.com>
---
config/lxc.conf.libvirt | 6 +++---
config/lxc.conf.ubuntu | 6 +++---
config/lxc.conf.unknown | 2 +-
templates/lxc-altlinux.in | 4 ++--
templates/lxc-archlinux.in | 18 +++++++++---------
templates/lxc-busybox.in | 6 +++---
templates/lxc-debian.in | 4 ++--
templates/lxc-fedora.in | 2 +-
templates/lxc-lenny.in | 4 ++--
templates/lxc-opensuse.in | 2 +-
templates/lxc-oracle.in | 2 +-
templates/lxc-sshd.in | 18 +++++++++---------
templates/lxc-ubuntu | 2 +-
templates/lxc-ubuntu-cloud.in | 2 +-
14 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/config/lxc.conf.libvirt b/config/lxc.conf.libvirt
index 7128619..6950dca 100644
--- a/config/lxc.conf.libvirt
+++ b/config/lxc.conf.libvirt
@@ -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
diff --git a/config/lxc.conf.ubuntu b/config/lxc.conf.ubuntu
index d2ac167..0a5ac71 100644
--- a/config/lxc.conf.ubuntu
+++ b/config/lxc.conf.ubuntu
@@ -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
diff --git a/config/lxc.conf.unknown b/config/lxc.conf.unknown
index 16fa9d6..6c88010 100644
--- a/config/lxc.conf.unknown
+++ b/config/lxc.conf.unknown
@@ -1 +1 @@
-lxc.network.type=empty
+lxc.network.type = empty
diff --git a/templates/lxc-altlinux.in b/templates/lxc-altlinux.in
index 0f5c901..174af6a 100644
--- a/templates/lxc-altlinux.in
+++ b/templates/lxc-altlinux.in
@@ -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"
diff --git a/templates/lxc-archlinux.in b/templates/lxc-archlinux.in
index 0c529ec..5db5b85 100644
--- a/templates/lxc-archlinux.in
+++ b/templates/lxc-archlinux.in
@@ -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
diff --git a/templates/lxc-busybox.in b/templates/lxc-busybox.in
index 91095a3..a8af4b2 100644
--- a/templates/lxc-busybox.in
+++ b/templates/lxc-busybox.in
@@ -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
}
diff --git a/templates/lxc-debian.in b/templates/lxc-debian.in
index 889852f..56279a8 100644
--- a/templates/lxc-debian.in
+++ b/templates/lxc-debian.in
@@ -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
diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in
index 47c703e..f93edc9 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -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
diff --git a/templates/lxc-lenny.in b/templates/lxc-lenny.in
index 46de1ea..1792726 100644
--- a/templates/lxc-lenny.in
+++ b/templates/lxc-lenny.in
@@ -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
diff --git a/templates/lxc-opensuse.in b/templates/lxc-opensuse.in
index 4f18526..f6bc31c 100644
--- a/templates/lxc-opensuse.in
+++ b/templates/lxc-opensuse.in
@@ -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
diff --git a/templates/lxc-oracle.in b/templates/lxc-oracle.in
index 1720379..43022d1 100644
--- a/templates/lxc-oracle.in
+++ b/templates/lxc-oracle.in
@@ -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
diff --git a/templates/lxc-sshd.in b/templates/lxc-sshd.in
index 7ba642d..ba64cbf 100644
--- a/templates/lxc-sshd.in
+++ b/templates/lxc-sshd.in
@@ -116,14 +116,14 @@ 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
@@ -131,7 +131,7 @@ EOF
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
}
diff --git a/templates/lxc-ubuntu b/templates/lxc-ubuntu
index 0b55c03..4ccb015 100644
--- a/templates/lxc-ubuntu
+++ b/templates/lxc-ubuntu
@@ -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
diff --git a/templates/lxc-ubuntu-cloud.in b/templates/lxc-ubuntu-cloud.in
index e1e7431..4ef5f8d 100644
--- a/templates/lxc-ubuntu-cloud.in
+++ b/templates/lxc-ubuntu-cloud.in
@@ -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
--
1.8.0
------------------------------------------------------------------------------
LogMeIn Rescue: Anywhere, Anytime Remote support for IT. Free Trial
Remotely access PCs and mobile devices and provide instant support
Improve your efficiency, and focus on delivering more value-add services
Discover what IT Professionals Know. Rescue delivers
http://p.sf.net/sfu/logmein_12329d2d
_______________________________________________
Lxc-devel mailing list
Lxc-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/lxc-devel
