Commit 19621357 authored by Leigh Stoller's avatar Leigh Stoller

Rename/move protogeni/scripts/quickvm to apt/create_instance.

parent c2f93fa2
...@@ -30,10 +30,11 @@ include $(OBJDIR)/Makeconf ...@@ -30,10 +30,11 @@ include $(OBJDIR)/Makeconf
SUBDIRS = SUBDIRS =
BIN_SCRIPTS = manage_profile manage_instance manage_dataset BIN_SCRIPTS = manage_profile manage_instance manage_dataset create_instance
SBIN_SCRIPTS = SBIN_SCRIPTS =
LIB_SCRIPTS = APT_Profile.pm APT_Instance.pm APT_Dataset.pm APT_Geni.pm LIB_SCRIPTS = APT_Profile.pm APT_Instance.pm APT_Dataset.pm APT_Geni.pm
WEB_BIN_SCRIPTS = webmanage_profile webmanage_instance webmanage_dataset WEB_BIN_SCRIPTS = webmanage_profile webmanage_instance webmanage_dataset \
webcreate_instance
WEB_SBIN_SCRIPTS= WEB_SBIN_SCRIPTS=
LIBEXEC_SCRIPTS = $(WEB_BIN_SCRIPTS) $(WEB_SBIN_SCRIPTS) LIBEXEC_SCRIPTS = $(WEB_BIN_SCRIPTS) $(WEB_SBIN_SCRIPTS)
......
...@@ -48,7 +48,7 @@ PSBIN_STUFF = register_resources expire_daemon gencrl postcrl \ ...@@ -48,7 +48,7 @@ PSBIN_STUFF = register_resources expire_daemon gencrl postcrl \
reservevlans delgeniuser delegatecredential \ reservevlans delgeniuser delegatecredential \
updatecert fixcerts initcerts cacontrol webcacontrol \ updatecert fixcerts initcerts cacontrol webcacontrol \
genextendcred rspeclint chstats listactive \ genextendcred rspeclint chstats listactive \
maptoslice webmaptoslice setexpiration quickvm webquickvm \ maptoslice webmaptoslice setexpiration \
mondbd parsecert creategeniuser webcreategeniuser \ mondbd parsecert creategeniuser webcreategeniuser \
updategeniuser webupdategeniuser updategeniuser webupdategeniuser
...@@ -75,7 +75,6 @@ include $(TESTBED_SRCDIR)/GNUmakerules ...@@ -75,7 +75,6 @@ include $(TESTBED_SRCDIR)/GNUmakerules
install: apt-install \ install: apt-install \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \ $(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
$(addprefix $(INSTALL_SBINDIR)/protogeni/, $(PSBIN_STUFF)) \ $(addprefix $(INSTALL_SBINDIR)/protogeni/, $(PSBIN_STUFF)) \
$(INSTALL_LIBEXECDIR)/webquickvm \
$(INSTALL_LIBEXECDIR)/webcacontrol \ $(INSTALL_LIBEXECDIR)/webcacontrol \
$(INSTALL_LIBEXECDIR)/webcreategeniuser \ $(INSTALL_LIBEXECDIR)/webcreategeniuser \
$(INSTALL_LIBEXECDIR)/webupdategeniuser \ $(INSTALL_LIBEXECDIR)/webupdategeniuser \
......
...@@ -170,7 +170,7 @@ class Instance ...@@ -170,7 +170,7 @@ class Instance
putenv("SERVER_NAME=" . $_SERVER['SERVER_NAME']); putenv("SERVER_NAME=" . $_SERVER['SERVER_NAME']);
} }
$retval = SUEXEC($uid, $pid, $retval = SUEXEC($uid, $pid,
"webquickvm $options -u $uuid $xmlname", "webcreate_instance $options -u $uuid $xmlname",
SUEXEC_ACTION_CONTINUE); SUEXEC_ACTION_CONTINUE);
if ($retval != 0) { if ($retval != 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment