[lxc-devel] [PATCH] lxc-{centos|fedora}: Respect --rootfs
Serge Hallyn
serge.hallyn at ubuntu.com
Wed Jan 28 11:00:46 UTC 2015
Quoting Stéphane Graber (stgraber at ubuntu.com):
> Close #406
>
> Signed-off-by: Stéphane Graber <stgraber at ubuntu.com>
Thank you!
Acked-by: Serge E. Hallyn <serge.hallyn at ubuntu.com>
> ---
> 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 fdc307a..4696ce3 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 a1d1e7b..499685f 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
> --
> 1.9.1
>
> _______________________________________________
> lxc-devel mailing list
> lxc-devel at lists.linuxcontainers.org
> http://lists.linuxcontainers.org/listinfo/lxc-devel
More information about the lxc-devel
mailing list