Author: Daniel Baumann <daniel.baumann@progress-technologies.net>
Description: Use /var/lib/lxctl instead of /var/lxc.

diff -Naurp lxctl.orig/Lxc/object.pm lxctl/Lxc/object.pm
--- lxctl.orig/Lxc/object.pm	2011-10-28 23:15:38.168644159 +0200
+++ lxctl/Lxc/object.pm	2011-10-29 08:18:34.634167327 +0200
@@ -767,8 +767,8 @@ sub new {
 sub init {
 	my ($self) = @_;
 	$self->{CONFIG_PATH} = "/etc/lxctl";
-	$self->{ROOTS_PATH} = "/var/lxc/root";
-	$self->{TEMPLATE_PATH} = "/var/lxc/templates";
+	$self->{ROOTS_PATH} = "/var/lib/lxctl/root";
+	$self->{TEMPLATE_PATH} = "/var/lib/lxctl/templates";
 	$self->{LXC_CONF_DIR} = "/var/lib/lxc";
 	$self->{CGROUP_PATH} = "/cgroup";
 	$self->{VG} = "vg00";
diff -Naurp lxctl.orig/lxctl lxctl/lxctl
--- lxctl.orig/lxctl	2011-10-28 23:15:38.172644185 +0200
+++ lxctl/lxctl	2011-10-29 08:19:31.250462884 +0200
@@ -127,7 +127,7 @@ B<Optional arguments:>
 
 	--config - path to configuration file, by default /etc/lxc/<container name> is used
 
-	--root - path to root file system, by default /var/lxc/<container name> is used
+	--root - path to root file system, by default /var/lib/lxctl/<container name> is used
 
 	--addpkg - list of additional packages (comma-separated)
 
diff -Naurp lxctl.orig/lxctl.yaml lxctl/lxctl.yaml
--- lxctl.orig/lxctl.yaml	2011-10-28 23:15:38.172644185 +0200
+++ lxctl/lxctl.yaml	2011-10-29 08:19:33.766475316 +0200
@@ -4,8 +4,8 @@ lvm:
 paths:
   YAML_CONFIG_PATH: '/etc/lxctl'
   LXC_CONF_DIR: '/var/lib/lxc'
-  ROOT_MOUNT_PATH: '/var/lxc/root'
-  TEMPLATE_PATH: '/var/lxc/templates'
+  ROOT_MOUNT_PATH: '/var/lib/lxctl/root'
+  TEMPLATE_PATH: '/var/lib/lxctl/templates'
   LXC_LOG_PATH: '/var/log/lxc.log'
   LXC_LOG_LEVEL: 'DEBUG'
 check:
diff -Naurp lxctl.orig/Makefile lxctl/Makefile
--- lxctl.orig/Makefile	2011-10-28 23:15:38.172644185 +0200
+++ lxctl/Makefile	2011-10-29 08:19:28.738453253 +0200
@@ -20,8 +20,8 @@ install:
 	install -d $(DESTDIR)/usr/lib/perl/5.10/Lxc
 	install -d $(DESTDIR)/usr/lib/perl/5.10/Lxctl
 	install -d $(DESTDIR)/usr/lib/perl/5.10/LxctlHelpers
-	install -d $(DESTDIR)/var/lxc/templates
-	install -d $(DESTDIR)/var/lxc/root
+	install -d $(DESTDIR)/var/lib/lxctl/templates
+	install -d $(DESTDIR)/var/lib/lxctl/root
 	
 	cp Lxc/* $(DESTDIR)/usr/lib/perl/5.10/Lxc
 	cp Lxctl/* $(DESTDIR)/usr/lib/perl/5.10/Lxctl
diff -Naurp lxctl.orig/yaml-test.pl lxctl/yaml-test.pl
--- lxctl.orig/yaml-test.pl	2011-10-28 23:06:31.000000000 +0200
+++ lxctl/yaml-test.pl	2011-10-29 08:19:37.666496956 +0200
@@ -7,9 +7,9 @@ use YAML::Tiny;
 my $yaml = YAML::Tiny->new;
 
 $yaml->[0]->{paths} = {LXC_CONF_DIR => '/var/lib/lxc',
-		ROOTS_PATH => '/var/lxc/root',
+		ROOTS_PATH => '/var/lib/lxctl/root',
 		CONFIG_PATH => '/var/lib/lxc',
-		TEMPLATE_PATH => '/var/lxc/templates',
+		TEMPLATE_PATH => '/var/lib/lxctl/templates',
 };
 
 $yaml->[0]->{lvm} = {VG => 'vg0', };
