summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Mendoza-Jonas <sam@mendozajonas.com>2017-07-25 16:07:53 +1000
committerSamuel Mendoza-Jonas <sam@mendozajonas.com>2017-08-15 13:03:28 +1000
commitf4d947604d0aeecb1ee42ae4d3c9895b65342176 (patch)
tree10cf9caad85cb8dc36a192787ff0c48e45251c63
parent9f9bc4da3369b5637963064e2cd9d98e9dbd20d4 (diff)
downloadtalos-petitboot-f4d947604d0aeecb1ee42ae4d3c9895b65342176.tar.gz
talos-petitboot-f4d947604d0aeecb1ee42ae4d3c9895b65342176.zip
Add pb-plugin and pb-exec to pb_system_apps
Signed-off-by: Samuel Mendoza-Jonas <sam@mendozajonas.com>
-rw-r--r--configure.ac2
-rw-r--r--lib/system/system.c2
-rw-r--r--lib/system/system.h2
-rw-r--r--utils/Makefile.am2
4 files changed, 7 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index bba964c..2c2f23b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -334,6 +334,8 @@ DEFINE_HOST_PROG(IP, ip, [/sbin/ip])
DEFINE_HOST_PROG(UDHCPC, udhcpc, [/sbin/udhcpc])
DEFINE_HOST_PROG(VGSCAN, vgscan, [/usr/sbin/vgscan])
DEFINE_HOST_PROG(VGCHANGE, vgchange, [/usr/sbin/vgchange])
+DEFINE_HOST_PROG(PB_PLUGIN, pb-plugin, [/usr/sbin/pb-plugin])
+DEFINE_HOST_PROG(PB_EXEC, pb-exec, [/usr/sbin/pb-exec])
AC_ARG_WITH(
[tftp],
diff --git a/lib/system/system.c b/lib/system/system.c
index b895610..33f79ed 100644
--- a/lib/system/system.c
+++ b/lib/system/system.c
@@ -30,6 +30,8 @@ const struct pb_system_apps pb_system_apps = {
.udhcpc = HOST_PROG_UDHCPC,
.vgscan = HOST_PROG_VGSCAN,
.vgchange = HOST_PROG_VGCHANGE,
+ .pb_plugin = HOST_PROG_PB_PLUGIN,
+ .pb_exec = HOST_PROG_PB_EXEC,
};
#ifndef TFTP_TYPE
diff --git a/lib/system/system.h b/lib/system/system.h
index 08301c0..e803391 100644
--- a/lib/system/system.h
+++ b/lib/system/system.h
@@ -15,6 +15,8 @@ struct pb_system_apps {
const char *udhcpc;
const char *vgscan;
const char *vgchange;
+ const char *pb_plugin;
+ const char *pb_exec;
};
extern const struct pb_system_apps pb_system_apps;
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 6c708eb..3ef3fe8 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -12,7 +12,7 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
-dist_sbin_SCRIPTS += utils/pb-udhcpc utils/pb-plugin utils/pb-sos
+dist_sbin_SCRIPTS += utils/pb-udhcpc utils/pb-plugin utils/pb-sos utils/pb-exec
dist_pkglibexec_SCRIPTS = utils/pb-console
sbin_PROGRAMS += utils/pb-event utils/pb-config
OpenPOWER on IntegriCloud