From: Stéphane Graber <stgraber@ubuntu.com>
Date: Wed, 28 Jan 2015 08:47:44 +0000 (+0100)
Subject: lxc-{centos|fedora}: Respect --rootfs
X-Git-Tag: lxc-1.0.8~179
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c5cfcff14fff3ebe3bd3e8f3bbb318e4ed6ef1f6;p=thirdparty%2Flxc.git

lxc-{centos|fedora}: Respect --rootfs

Close #406

Signed-off-by: Stéphane Graber <stgraber@ubuntu.com>
Acked-by: Serge E. Hallyn <serge.hallyn@ubuntu.com>
---

diff --git a/templates/lxc-centos.in b/templates/lxc-centos.in
index 2902acfaa..d809f3f82 100644
--- a/templates/lxc-centos.in
+++ b/templates/lxc-centos.in
@@ -689,7 +689,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;;
@@ -837,7 +837,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 4a4d2ded9..d800a2c35 100644
--- a/templates/lxc-fedora.in
+++ b/templates/lxc-fedora.in
@@ -1216,7 +1216,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;;
@@ -1363,7 +1363,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