mirror of
https://github.com/kata-containers/kata-containers.git
synced 2025-07-01 01:33:20 +00:00
snap: apply patch in runtime to fix config paths
This is a hotfix to fix https://github.com/kata-containers/runtime/issues/1185 Signed-off-by: Julio Montes <julio.montes@intel.com>
This commit is contained in:
parent
7c25b606ba
commit
7d77ae9ca8
22
snap/1185-runtime.patch
Normal file
22
snap/1185-runtime.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
diff --git a/cli/main.go b/cli/main.go
|
||||||
|
index a01a02dc5..a021a0a77 100644
|
||||||
|
--- a/cli/main.go
|
||||||
|
+++ b/cli/main.go
|
||||||
|
@@ -250,6 +250,8 @@ func beforeSubcommands(c *cli.Context) error {
|
||||||
|
var runtimeConfig oci.RuntimeConfig
|
||||||
|
var err error
|
||||||
|
|
||||||
|
+ katautils.SetConfigOptions(name, defaultRuntimeConfiguration, defaultSysConfRuntimeConfiguration)
|
||||||
|
+
|
||||||
|
handleShowConfig(c)
|
||||||
|
|
||||||
|
if userWantsUsage(c) || (c.NArg() == 1 && (c.Args()[0] == checkCmd)) {
|
||||||
|
@@ -302,8 +304,6 @@ func beforeSubcommands(c *cli.Context) error {
|
||||||
|
ignoreLogging = true
|
||||||
|
}
|
||||||
|
|
||||||
|
- katautils.SetConfigOptions(name, defaultRuntimeConfiguration, defaultSysConfRuntimeConfiguration)
|
||||||
|
-
|
||||||
|
configFile, runtimeConfig, err = katautils.LoadConfiguration(c.GlobalString(configFilePathOption), ignoreLogging, false)
|
||||||
|
if err != nil {
|
||||||
|
fatal(err)
|
@ -34,6 +34,7 @@ parts:
|
|||||||
override-build: |
|
override-build: |
|
||||||
pkg_name=runtime
|
pkg_name=runtime
|
||||||
patch1="$(realpath ../../../snap/1162-runtime.patch)"
|
patch1="$(realpath ../../../snap/1162-runtime.patch)"
|
||||||
|
patch2="$(realpath ../../../snap/1185-runtime.patch)"
|
||||||
|
|
||||||
# set GOPATH
|
# set GOPATH
|
||||||
export GOPATH=$(realpath go)
|
export GOPATH=$(realpath go)
|
||||||
@ -49,6 +50,8 @@ parts:
|
|||||||
|
|
||||||
#Issue: https://github.com/kata-containers/runtime/pull/1162
|
#Issue: https://github.com/kata-containers/runtime/pull/1162
|
||||||
patch -p1 < "${patch1}"
|
patch -p1 < "${patch1}"
|
||||||
|
#Issue: https://github.com/kata-containers/runtime/issues/1185
|
||||||
|
patch -p1 < "${patch2}"
|
||||||
|
|
||||||
# build and install
|
# build and install
|
||||||
make \
|
make \
|
||||||
|
Loading…
Reference in New Issue
Block a user