fixed broken master creation because guestAdditions was not executed.fixed but related to qemu (https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/732864) where

a lock file (/etc/gshadow.lock) on the master prevents clones from adding users. AdminAccess should work now
This commit is contained in:
David Ribeiro Alves 2012-03-14 23:55:55 +00:00
parent c161f9bc09
commit 1036c7a0f1
2 changed files with 8 additions and 7 deletions

View File

@ -121,18 +121,18 @@ public class CreateAndInstallVm implements Function<MasterSpec, IMachine> {
"timed out waiting for guest %s to be accessible via ssh", "timed out waiting for guest %s to be accessible via ssh",
vmName); vmName);
//logger.debug(">> awaiting installation of guest additions on vm: %s", vmName); logger.debug(">> awaiting installation of guest additions on vm: %s", vmName);
//checkState(guestAdditionsInstaller.apply(vm)); checkState(guestAdditionsInstaller.apply(vm));
logger.debug(">> awaiting post-installation actions on vm: %s", vmName); logger.debug(">> awaiting post-installation actions on vm: %s", vmName);
NodeMetadata vmMetadata = imachineToNodeMetadata.apply(vm); // NodeMetadata vmMetadata = imachineToNodeMetadata.apply(vm);
ListenableFuture<ExecResponse> execFuture = // ListenableFuture<ExecResponse> execFuture =
machineUtils.runScriptOnNode(vmMetadata, call("cleanupUdevIfNeeded"), RunScriptOptions.NONE); // machineUtils.runScriptOnNode(vmMetadata, call("cleanupUdevIfNeeded"), RunScriptOptions.NONE);
ExecResponse execResponse = Futures.getUnchecked(execFuture); // ExecResponse execResponse = Futures.getUnchecked(execFuture);
checkState(execResponse.getExitStatus() == 0); // checkState(execResponse.getExitStatus() == 0);
logger.debug( logger.debug(
"<< installation of image complete. Powering down node(%s)", "<< installation of image complete. Powering down node(%s)",

View File

@ -10,5 +10,6 @@ function installModuleAssistantIfNeeded {
mkdir /etc/udev/rules.d/70-persistent-net.rules; mkdir /etc/udev/rules.d/70-persistent-net.rules;
rm -rf /dev/.udev/; rm -rf /dev/.udev/;
rm /lib/udev/rules.d/75-persistent-net-generator.rules rm /lib/udev/rules.d/75-persistent-net-generator.rules
rm -f /etc/passwd.lock /etc/group.lock /etc/gshadow.lock
fi fi
} }