From 9f177a00130a70e9c7f64432a8dea3b64e533fe5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Graber?= Date: Wed, 28 Jan 2015 09:47:44 +0100 Subject: [PATCH] lxc-{centos|fedora}: Respect --rootfs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Close #406 Signed-off-by: Stéphane Graber Acked-by: Serge E. Hallyn --- templates/lxc-centos.in | 3 +-- templates/lxc-fedora.in | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in index fdc307aaf..4696ce37e 100644 --- a/templates/lxc-centos.in +++ b/templates/lxc-centos.in @@ -693,7 +693,7 @@ do case "$1" in -h|--help) usage $0 && exit 0;; -p|--path) path=$2; shift 2;; - --rootfs) rootfs=$2; shift 2;; + --rootfs) rootfs_path=$2; shift 2;; -n|--name) name=$2; shift 2;; -c|--clean) clean=1; shift 1;; -R|--release) release=$2; shift 2;; @@ -827,7 +827,6 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi - if [ -z "$rootfs_path" ]; then rootfs_path=$path/rootfs # check for 'lxc.rootfs' passed in through default config by lxc-create diff --git a/templates/lxc-fedora.in b/templates/lxc-fedora.in index a1d1e7b05..499685f3b 100644 --- a/templates/lxc-fedora.in +++ b/templates/lxc-fedora.in @@ -1215,7 +1215,7 @@ do case "$1" in -h|--help) usage $0 && exit 0;; -p|--path) path=$2; shift 2;; - --rootfs) rootfs=$2; shift 2;; + --rootfs) rootfs_path=$2; shift 2;; -n|--name) name=$2; shift 2;; -c|--clean) clean=1; shift 1;; -R|--release) release=$2; shift 2;; @@ -1354,7 +1354,6 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi - if [ -z "$rootfs_path" ]; then rootfs_path=$path/rootfs # check for 'lxc.rootfs' passed in through default config by lxc-create