From d0f5d25e4dc5146d589f257982e3382ab7532b0b Mon Sep 17 00:00:00 2001
From: Danct12 <danct12@disroot.org>
Date: Sun, 21 Apr 2019 14:50:56 +0700
Subject: [PATCH] hybris/lxc-android: patched config for the latest lxc version
 (!330)

The config file for container from Halium repo is outdated, and will not
load on latest version of LXC, here is the error when you start the container:

postmarketos:~$ sudo lxc-start android
lxc-start: android: confile.c: parse_line: 2447 Unknown configuration key "lxc.rootfs"
lxc-start: android: parse.c: lxc_file_for_each_line_mmap: 142 Failed to parse config file "/var/lib/lxc/android/config" at line "lxc.rootfs = /var/lib/lxc/android/rootfs"
Failed to load config for android
lxc-start: android: tools/lxc_start.c: main: 264 Failed to create lxc_container
postmarketos:~$

This pull request updates the config file, but also use the latest
commit.
---
 hybris/lxc-android/APKBUILD        | 11 +++++++----
 hybris/lxc-android/lxcconfig.patch | 31 ++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 4 deletions(-)
 create mode 100644 hybris/lxc-android/lxcconfig.patch

diff --git a/hybris/lxc-android/APKBUILD b/hybris/lxc-android/APKBUILD
index 4928fe371..11d349995 100644
--- a/hybris/lxc-android/APKBUILD
+++ b/hybris/lxc-android/APKBUILD
@@ -1,17 +1,19 @@
 pkgname=lxc-android
-pkgver=1.0_git20180311
+pkgver=1.0_git20190315
 pkgrel=0
 arch="noarch"
 url="https://github.com/Halium/lxc-android"
 license="Apache"
 makedepends=""
 depends="lxc"
-_commit="f490b2cd0ca0498543089d79f15c24f3801cd8b7"
+_commit="9551443e5ab11d0d21cb544f681bcb7603b870de"
 install="$pkgname.post-install"
-source="$pkgname-$_rev.tar.gz::https://github.com/Halium/$pkgname/archive/$_commit.tar.gz
+source="$pkgname-$_commit.tar.gz::https://github.com/Halium/$pkgname/archive/$_commit.tar.gz
     pre-start.sh
+    lxcconfig.patch
     lxc-android.init"
 pkgdesc="Configuration for starting Halium build of Android inside LXC container"
+options="!check"
 
 builddir="$srcdir/$pkgname-$_commit"
 
@@ -35,6 +37,7 @@ package() {
 	install -Dm755 "${srcdir}/lxc-android.init" \
 		"${pkgdir}/etc/init.d/lxc-android"
 }
-sha512sums="aed41538bc19fd228605bef4bf089a7bbc96964211abe5932e8685d089c32fce11fa7ba1068ad28f345895fef0d02dd388c4faef3c6abdbfbdd10ba96fcbbed0  lxc-android-.tar.gz
+sha512sums="348650f24464abb7a5d2b3e86e762efbdf770bf5f91d4fb12eb62290e3e29b94bcb91fac36cb0b550f4cb1ad9941b97ea7b7c44cccdf9af51d6b35233b6fe46d  lxc-android-9551443e5ab11d0d21cb544f681bcb7603b870de.tar.gz
 ef7081ea55a1acd5a6c5a973b4a7fc79bad4d5fdc721bc481e4ed92962a8ba9b70634e2a0a8f0afd28c14bd1fd4e1956914f68239c3dc34e41e167254252b1df  pre-start.sh
+7e8981ba9c779bf893dfddbe495dcaacfa43154748e21dd14fed2696d50b55807585d7168b79d73769d1381bb9974d7661479a303bacef883da0e0cf07dd0ad7  lxcconfig.patch
 ad373e26fb4850f887ca0be76a4c5f19115e214dcbdc315cf24e41eabfd03eebf8f19085a49c97661861b16e8005355c7fd10e86acdb4593d43250e3fed998fb  lxc-android.init"
diff --git a/hybris/lxc-android/lxcconfig.patch b/hybris/lxc-android/lxcconfig.patch
new file mode 100644
index 000000000..a6ae99034
--- /dev/null
+++ b/hybris/lxc-android/lxcconfig.patch
@@ -0,0 +1,31 @@
+diff --git a/var/lib/lxc/android/config b/var/lib/lxc/android/config
+index 912b72c..af33a23 100644
+--- a/var/lib/lxc/android/config
++++ b/var/lib/lxc/android/config
+@@ -1,18 +1,17 @@
+-lxc.rootfs = /var/lib/lxc/android/rootfs
+-lxc.utsname = armhf
++lxc.rootfs.path = /var/lib/lxc/android/rootfs
++lxc.uts.name = armhf
+ 
+-lxc.network.type = none
++lxc.net.0.type = none
+ 
+-lxc.devttydir = lxc
+-lxc.tty = 4
+-lxc.pts = 1024
++lxc.tty.dir = lxc
++lxc.tty.max  = 4
++lxc.pty.max = 1024
+ lxc.arch = armhf
+ lxc.cap.drop = mac_admin mac_override
+-lxc.pivotdir = lxc_putold
+ 
+ lxc.hook.pre-start = /var/lib/lxc/android/pre-start.sh
+ 
+-lxc.init_cmd = /init
++lxc.init.cmd = /init
+ 
+-lxc.aa_profile = unconfined
++lxc.apparmor.profile = unconfined
+ lxc.autodev = 0