From 4a0e2dea703668dadb4f104799715846cac9966d Mon Sep 17 00:00:00 2001
From: iaroki <iaroki@protonmail.com>
Date: Mon, 30 Jul 2018 17:08:49 +0300
Subject: [PATCH] lxc: fix deprecated config keys in void template

---
 srcpkgs/lxc/files/lxc-void | 8 ++++----
 srcpkgs/lxc/template       | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/srcpkgs/lxc/files/lxc-void b/srcpkgs/lxc/files/lxc-void
index 293c45c2e11..675885ffa6d 100755
--- a/srcpkgs/lxc/files/lxc-void
+++ b/srcpkgs/lxc/files/lxc-void
@@ -67,9 +67,9 @@ copy_configuration() {
 
     # if there is exactly one veth network entry, make sure it has an
     # associated hwaddr.
-    nics=`grep -e '^lxc\.network\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
+    nics=`grep -e '^lxc\.net\.0\.type[ \t]*=[ \t]*veth' $path/config | wc -l`
     if [ $nics -eq 1 ]; then
-        grep -q "^lxc.network.hwaddr" $path/config || sed -i -e "/^lxc\.network\.type[ \t]*=[ \t]*veth/a lxc.network.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" $path/config
+        grep -q "^lxc.net.0.hwaddr" $path/config || sed -i -e "/^lxc\.net\.0\.type[ \t]*=[ \t]*veth/a lxc.net.0.hwaddr = 00:16:3e:$(openssl rand -hex 3| sed 's/\(..\)/\1:/g; s/.$//')" $path/config
     fi
 
     ## Add all the includes
@@ -82,10 +82,10 @@ copy_configuration() {
     ## Add the container-specific config
     echo "" >> $path/config
     echo "# Container specific configuration" >> $path/config
-    grep -q "^lxc.rootfs" $path/config 2> /dev/null || echo "lxc.rootfs = $rootfs" >> $path/config
+    grep -q "^lxc.rootfs.path" $path/config 2> /dev/null || echo "lxc.rootfs.path = $rootfs" >> $path/config
 
     cat <<EOF >> $path/config
-lxc.utsname = $hostname
+lxc.uts.name = $hostname
 lxc.arch = $arch
 EOF
 
diff --git a/srcpkgs/lxc/template b/srcpkgs/lxc/template
index eb166c9f9fc..1322cf613b7 100644
--- a/srcpkgs/lxc/template
+++ b/srcpkgs/lxc/template
@@ -3,7 +3,7 @@ _desc="Linux Containers"
 
 pkgname=lxc
 version=3.0.1
-revision=1
+revision=2
 build_style=gnu-configure
 configure_args="--enable-doc --enable-seccomp
  --enable-capabilities --disable-apparmor --with-distro=none