From: Samuel Mendoza-Jonas Date: Tue, 25 Jul 2017 06:07:53 +0000 (+1000) Subject: Add pb-plugin and pb-exec to pb_system_apps X-Git-Tag: v1.6.0~11 X-Git-Url: https://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=f4d947604d0aeecb1ee42ae4d3c9895b65342176 Add pb-plugin and pb-exec to pb_system_apps Signed-off-by: Samuel Mendoza-Jonas --- 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