Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
19621357
Commit
19621357
authored
Oct 29, 2014
by
Leigh B Stoller
Browse files
Rename/move protogeni/scripts/quickvm to apt/create_instance.
parent
c2f93fa2
Changes
4
Hide whitespace changes
Inline
Side-by-side
apt/GNUmakefile.in
View file @
19621357
...
...
@@ -30,10 +30,11 @@ include $(OBJDIR)/Makeconf
SUBDIRS =
BIN_SCRIPTS = manage_profile manage_instance manage_dataset
BIN_SCRIPTS = manage_profile manage_instance manage_dataset
create_instance
SBIN_SCRIPTS =
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=
LIBEXEC_SCRIPTS = $(WEB_BIN_SCRIPTS) $(WEB_SBIN_SCRIPTS)
...
...
protogeni/scripts/quickvm
.in
→
apt/create_instance
.in
View file @
19621357
File moved
protogeni/scripts/GNUmakefile.in
View file @
19621357
...
...
@@ -48,7 +48,7 @@ PSBIN_STUFF = register_resources expire_daemon gencrl postcrl \
reservevlans delgeniuser delegatecredential \
updatecert fixcerts initcerts cacontrol webcacontrol \
genextendcred rspeclint chstats listactive \
maptoslice webmaptoslice setexpiration
quickvm webquickvm
\
maptoslice webmaptoslice setexpiration \
mondbd parsecert creategeniuser webcreategeniuser \
updategeniuser webupdategeniuser
...
...
@@ -75,7 +75,6 @@ include $(TESTBED_SRCDIR)/GNUmakerules
install: apt-install \
$(addprefix $(INSTALL_SBINDIR)/, $(SBIN_STUFF)) \
$(addprefix $(INSTALL_SBINDIR)/protogeni/, $(PSBIN_STUFF)) \
$(INSTALL_LIBEXECDIR)/webquickvm \
$(INSTALL_LIBEXECDIR)/webcacontrol \
$(INSTALL_LIBEXECDIR)/webcreategeniuser \
$(INSTALL_LIBEXECDIR)/webupdategeniuser \
...
...
www/aptui/instance_defs.php
View file @
19621357
...
...
@@ -170,7 +170,7 @@ class Instance
putenv
(
"SERVER_NAME="
.
$_SERVER
[
'SERVER_NAME'
]);
}
$retval
=
SUEXEC
(
$uid
,
$pid
,
"web
quickvm
$options
-u
$uuid
$xmlname
"
,
"web
create_instance
$options
-u
$uuid
$xmlname
"
,
SUEXEC_ACTION_CONTINUE
);
if
(
$retval
!=
0
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment