[lxc-devel] [lxc-ci/master] [sabayon] Fix use of armv7l arch and setting of ssh service through systemd

[geaaru on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 332 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20170302/4625516e/attachment.bin>
-------------- next part --------------
From bca972088d47eaa15d876e15e4814256ba74d24e Mon Sep 17 00:00:00 2001
From: Geaaru <geaaru at gmail.com>
Date: Thu, 2 Mar 2017 15:31:54 +0100
Subject: [PATCH] [sabayon] Fix use of armv7l arch and setting of ssh service
 through systemd

Signed-off-by: Geaaru <geaaru at gmail.com>
---
 templates/sabayon.json | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/templates/sabayon.json b/templates/sabayon.json
index 7de4ac0..6c73e7b 100644
--- a/templates/sabayon.json
+++ b/templates/sabayon.json
@@ -1,16 +1,15 @@
 {
     "create_message": ["You just created a Sabayon container ",
-                       "(release=RELEASE, arch=ARCH, variant=VARIANT)\n\n",
-                       "To enable sshd, run: rc-update add sshd"],
+                       "(release=RELEASE, arch=ARCH, u=Unprivileged Container)\n\n",
+                       "To enable sshd, run: systemctl enable sshd"],
     "expiry": 30,
     "templates": ["/etc/conf.d/hostname", "/etc/hostname", "/etc/hosts"],
     "config_user": ["common", "userns"],
     "config_system": ["common"],
     "template_arch": {"amd64": "amd64",
-                      "armhf": "arm",
-                      "i386": "x86"},
+                      "armv7l": "armv7l"},
     "template_args": ["-a", "ARCH"],
     "template_env": {"root_password": "root"},
     "post_create": ["passwd -dl root",
-                    "rc-update del sshd"]
+                    "systemctl disable sshd"]
 }