Add riscv64 to --arch parameter values

lxc-attach uses an --arch parameter. 'riscv64' should be a usable value.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>

diff --git a/config/bash/lxc.in b/config/bash/lxc.in
index dd9770425790c8b2b4f2c3b9cc981d6c667d20df..6672bf02d99b9367f7fa77edcb6235ac447b3bab 100644 (file)
--- a/config/bash/lxc.in
+++ b/config/bash/lxc.in
@@ -285,7 +285,7 @@ _lxc_attach() {
             ;;
         --arch | -a )
             # https://github.com/lxc/lxc/blob/stable-4.0/src/tests/arch_parse.c#L37
-            COMPREPLY=( $( compgen -W 'arm armel armhf armv7l athlon i386 i486 i586 i686 linux32 mips mipsel ppc powerpc x86 aarch64 amd64 arm64 linux64 mips64 mips64el ppc64 ppc64el ppc64le powerpc64 s390x x86_64' -- "${cur}" ) )
+            COMPREPLY=( $( compgen -W 'arm armel armhf armv7l athlon i386 i486 i586 i686 linux32 mips mipsel ppc powerpc x86 aarch64 amd64 arm64 linux64 mips64 mips64el ppc64 ppc64el ppc64le powerpc64 riscv64 s390x x86_64' -- "${cur}" ) )
             return
             ;;
         --elevated-privileges | -e )

diff --git a/src/lxc/confile.c b/src/lxc/confile.c
index 2d20a72ef2b6add3b012216e788002a2225d4ce6..213688060dc4d5d9334265fab4f9b1f61d753584 100644 (file)
--- a/src/lxc/confile.c
+++ b/src/lxc/confile.c
@@ -2993,6 +2993,7 @@ int lxc_config_parse_arch(const char *arch, signed long *persona)
                { "ppc64el",   PER_LINUX   },
                { "ppc64le",   PER_LINUX   },
                { "powerpc64", PER_LINUX   },
+               { "riscv64",   PER_LINUX   },
                { "s390x",     PER_LINUX   },
                { "x86_64",    PER_LINUX   },
        };

diff --git a/src/tests/arch_parse.c b/src/tests/arch_parse.c
index f8a0a46d27c6b1b7c30c630158efdd242259bbfd..38ec972d34179192111dabc89780e8817e555fe9 100644 (file)
--- a/src/tests/arch_parse.c
+++ b/src/tests/arch_parse.c
@@ -38,7 +38,7 @@ static const char *const arches[] = {
     "arm",   "armel",  "armhf",   "armv7l",    "athlon",  "i386",   "i486",
     "i586",  "i686",   "linux32", "mips",      "mipsel",  "ppc",    "powerpc",
     "x86",   "aarch64", "amd64",   "arm64",    "linux64", "mips64", "mips64el",
-    "ppc64", "ppc64el", "ppc64le", "powerpc64", "s390x",   "x86_64",
+    "ppc64", "ppc64el", "ppc64le", "powerpc64", "riscv64", "s390x",  "x86_64",
 };
 
 static bool parse_valid_architectures(void)