From c05de6874cf39faade21157faa526b40e2faf931 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Kowalczyk?= Date: Sun, 7 Jun 2020 01:31:59 +0200 Subject: [PATCH] Fix incorrect usages of 'loader.execname' in manifests --- Examples/bash/manifest.template | 2 +- Examples/curl/curl.manifest.template | 2 +- Examples/nodejs-express-server/nodejs.manifest.template | 2 +- Examples/nodejs/nodejs.manifest.template | 2 +- LibOS/shim/test/regression/echo.manifest.template | 2 +- LibOS/shim/test/regression/sh.manifest.template | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Examples/bash/manifest.template b/Examples/bash/manifest.template index d2bc1343..f9dfc223 100644 --- a/Examples/bash/manifest.template +++ b/Examples/bash/manifest.template @@ -6,7 +6,7 @@ # The executable to load in Graphene. We replace EXECPATH and EXECNAME for # each program that a manifest is generated for. loader.exec = file:$(EXECPATH) -loader.execname = file:$(EXECNAME) +loader.execname = $(EXECNAME) # Graphene environment, including the path of the library OS and the debug # option (inline/none). diff --git a/Examples/curl/curl.manifest.template b/Examples/curl/curl.manifest.template index e16551e0..34469657 100644 --- a/Examples/curl/curl.manifest.template +++ b/Examples/curl/curl.manifest.template @@ -4,7 +4,7 @@ # Executable to load into Graphene and run. loader.exec = file:$(CURL_DIR)curl -loader.execname = file:curl +loader.execname = curl # LibOS layer library of Graphene. There is currently only one implementation, # so it is always set to libsysdb.so. diff --git a/Examples/nodejs-express-server/nodejs.manifest.template b/Examples/nodejs-express-server/nodejs.manifest.template index eecb799e..f92b0d46 100644 --- a/Examples/nodejs-express-server/nodejs.manifest.template +++ b/Examples/nodejs-express-server/nodejs.manifest.template @@ -4,7 +4,7 @@ # Executable to load into Graphene and run. loader.exec = file:$(NODEJS_DIR)nodejs -loader.execname = file:nodejs +loader.execname = nodejs # LibOS layer library of Graphene. There is currently only one implementation, # so it is always set to libsysdb.so. diff --git a/Examples/nodejs/nodejs.manifest.template b/Examples/nodejs/nodejs.manifest.template index c05947f7..b057a090 100644 --- a/Examples/nodejs/nodejs.manifest.template +++ b/Examples/nodejs/nodejs.manifest.template @@ -4,7 +4,7 @@ # Executable to load into Graphene and run. loader.exec = file:$(NODEJS_DIR)nodejs -loader.execname = file:nodejs +loader.execname = nodejs # LibOS layer library of Graphene. There is currently only one implementation, # so it is always set to libsysdb.so. diff --git a/LibOS/shim/test/regression/echo.manifest.template b/LibOS/shim/test/regression/echo.manifest.template index c8d7858d..6c5d8e73 100644 --- a/LibOS/shim/test/regression/echo.manifest.template +++ b/LibOS/shim/test/regression/echo.manifest.template @@ -1,5 +1,5 @@ loader.exec = file:/bin/echo -loader.execname = file:echo +loader.execname = echo loader.preload = file:../../src/libsysdb.so loader.env.LD_LIBRARY_PATH = /lib:$(ARCH_LIBDIR):/usr/$(ARCH_LIBDIR) diff --git a/LibOS/shim/test/regression/sh.manifest.template b/LibOS/shim/test/regression/sh.manifest.template index 5c57ea47..5d8719b4 100644 --- a/LibOS/shim/test/regression/sh.manifest.template +++ b/LibOS/shim/test/regression/sh.manifest.template @@ -1,5 +1,5 @@ loader.exec = file:/bin/sh -loader.execname = file:sh +loader.execname = sh loader.preload = file:../../src/libsysdb.so loader.env.LD_LIBRARY_PATH = /lib:$(ARCH_LIBDIR):/usr/$(ARCH_LIBDIR)