From 112dc09c274e68b577e2c3d76e6ff0fcac3d3289 Mon Sep 17 00:00:00 2001 From: Dariusz Michaluk Date: Mon, 15 Dec 2014 12:55:16 +0100 Subject: [PATCH] Update tizen common (with wayland) lxc template [Bug/Feature] N/A [Cause] N/A [Solution] N/A [Verification] Build, install, run tests Change-Id: Ib7621c70a708fea479dc0d2e7d4bbc528728c504 Signed-off-by: Dariusz Michaluk --- .../configs/lxc-templates/tizen-common-wayland.sh | 23 +++++++++------------- server/configs/zones/business.conf | 2 +- server/configs/zones/private.conf | 2 +- 3 files changed, 11 insertions(+), 16 deletions(-) diff --git a/server/configs/lxc-templates/tizen-common-wayland.sh b/server/configs/lxc-templates/tizen-common-wayland.sh index ed2df9b..12fb223 100755 --- a/server/configs/lxc-templates/tizen-common-wayland.sh +++ b/server/configs/lxc-templates/tizen-common-wayland.sh @@ -23,14 +23,14 @@ usage() cat < - [-p|--path=] [-r|--rootfs=] [-v|--vt=] + [-p|--path=] [--rootfs=] [--vt=] [--ipv4=] [--ipv4-gateway=] [-h|--help] Mandatory args: -n,--name zone name Optional args: - -p,--path path to zone config files, defaults to /var/lib/lxc - --rootfs path to zone rootfs, defaults to /var/lib/lxc/[NAME]/rootfs - -v,--vt zone virtual terminal + -p,--path path to zone config files + --rootfs path to zone rootfs + --vt zone virtual terminal --ipv4 zone IP address --ipv4-gateway zone gateway -h,--help print help @@ -38,7 +38,7 @@ EOF return 0 } -options=$(getopt -o hp:v:n: -l help,rootfs:,path:,vt:,name:,ipv4:,ipv4-gateway: -- "$@") +options=$(getopt -o hp:n: -l help,rootfs:,path:,vt:,name:,ipv4:,ipv4-gateway: -- "$@") if [ $? -ne 0 ]; then usage $(basename $0) exit 1 @@ -51,7 +51,7 @@ do -h|--help) usage $0 && exit 0;; --rootfs) rootfs=$2; shift 2;; -p|--path) path=$2; shift 2;; - -v|--vt) vt=$2; shift 2;; + --vt) vt=$2; shift 2;; -n|--name) name=$2; shift 2;; --ipv4) ipv4=$2; shift 2;; --ipv4-gateway) ipv4_gateway=$2; shift 2;; @@ -94,14 +94,12 @@ ${rootfs}/opt \ ${rootfs}/proc \ ${rootfs}/root \ ${rootfs}/run \ -${rootfs}/run/dbus \ -${rootfs}/run/memory \ -${rootfs}/run/systemd \ -${rootfs}/run/udev \ ${rootfs}/sbin \ ${rootfs}/sys \ ${rootfs}/tmp \ ${rootfs}/usr \ +${rootfs}/var \ +${rootfs}/var/run \ ${path}/hooks \ ${path}/scripts \ ${path}/systemd \ @@ -389,10 +387,7 @@ ${path}/systemd/user etc/systemd/user none ro,bind 0 0 /opt opt none rw,rbind 0 0 devtmpfs dev devtmpfs rw,relatime,mode=755 0 0 devpts dev/pts devpts rw,relatime,gid=5,mode=620,ptmxmode=000 0 0 -/run/dbus run/dbus none rw,bind 0 0 -/run/memory run/memory none rw,bind 0 0 -/run/systemd run/systemd none rw,bind 0 0 -/run/udev run/udev none rw,bind 0 0 /sys/fs/smackfs sys/fs/smackfs none rw,bind 0 0 +/var/run/zones/${name}/run var/run none rw,bind 0 0 #tmpfs run tmpfs rw,nosuid,nodev,mode=755 0 0 EOF diff --git a/server/configs/zones/business.conf b/server/configs/zones/business.conf index b211ce3..6a4bc50 100644 --- a/server/configs/zones/business.conf +++ b/server/configs/zones/business.conf @@ -1,6 +1,6 @@ { "name" : "business", - "lxcTemplate" : "template.sh", + "lxcTemplate" : "tizen-common-wayland.sh", "initWithArgs" : [], "ipv4Gateway" : "10.0.102.1", "ipv4" : "10.0.102.2", diff --git a/server/configs/zones/private.conf b/server/configs/zones/private.conf index b4fb56a..2a1147f 100644 --- a/server/configs/zones/private.conf +++ b/server/configs/zones/private.conf @@ -1,6 +1,6 @@ { "name" : "private", - "lxcTemplate" : "template.sh", + "lxcTemplate" : "tizen-common-wayland.sh", "initWithArgs" : [], "ipv4Gateway" : "10.0.101.1", "ipv4" : "10.0.101.2", -- 2.7.4