From b1333b1f2cc6fda026ae1f71d5fc17fc421881ac Mon Sep 17 00:00:00 2001
From: David Ribeiro Alves <davidralves@gmail.com>
Date: Thu, 15 Mar 2012 03:03:53 +0000
Subject: [PATCH] moved deleting gshadow lock to the clones since it was
 reappearing on the master

---
 .../virtualbox/functions/NodeCreator.java     |  5 ++
 .../statements/DeleteGShadowLock.java         | 48 +++++++++++++++++++
 .../installModuleAssistantIfNeeded.sh         |  1 -
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 labs/virtualbox/src/main/java/org/jclouds/virtualbox/statements/DeleteGShadowLock.java

diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java
index 0366dd0134..af81d40b6c 100644
--- a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java
+++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/functions/NodeCreator.java
@@ -43,6 +43,7 @@ import org.jclouds.virtualbox.domain.NetworkInterfaceCard;
 import org.jclouds.virtualbox.domain.NetworkSpec;
 import org.jclouds.virtualbox.domain.NodeSpec;
 import org.jclouds.virtualbox.domain.VmSpec;
+import org.jclouds.virtualbox.statements.DeleteGShadowLock;
 import org.jclouds.virtualbox.statements.SetIpAddress;
 import org.jclouds.virtualbox.util.MachineUtils;
 import org.virtualbox_4_1.CleanupMode;
@@ -153,6 +154,10 @@ public class NodeCreator implements Function<NodeSpec, NodeAndInitialCredentials
 
       new LaunchMachineIfNotAlreadyRunning(manager.get(), ExecutionType.GUI, "").apply(cloned);
 
+      // see DeleteGShadowLock for a detailed explanation
+      machineUtils
+               .runScriptOnNode(imachineToNodeMetadata.apply(cloned), new DeleteGShadowLock(), RunScriptOptions.NONE);
+
       // CASE NAT + HOST-ONLY
       machineUtils.runScriptOnNode(imachineToNodeMetadata.apply(cloned), new SetIpAddress(hostOnlyIfaceCard),
                RunScriptOptions.NONE);
diff --git a/labs/virtualbox/src/main/java/org/jclouds/virtualbox/statements/DeleteGShadowLock.java b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/statements/DeleteGShadowLock.java
new file mode 100644
index 0000000000..e267e14cdc
--- /dev/null
+++ b/labs/virtualbox/src/main/java/org/jclouds/virtualbox/statements/DeleteGShadowLock.java
@@ -0,0 +1,48 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.jclouds.virtualbox.statements;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+import org.jclouds.scriptbuilder.domain.OsFamily;
+import org.jclouds.scriptbuilder.domain.Statement;
+
+import com.google.common.collect.ImmutableList;
+
+/**
+ * Deletes /etc/gshadow.lock https://bugs.launchpad.net/ubuntu/+source/qemu/+bug/732864.
+ * 
+ * @author dralves
+ * 
+ */
+public class DeleteGShadowLock implements Statement {
+
+   @Override
+   public Iterable<String> functionDependencies(OsFamily family) {
+      return ImmutableList.of();
+   }
+
+   @Override
+   public String render(OsFamily family) {
+      if (checkNotNull(family, "family") == OsFamily.WINDOWS)
+         throw new UnsupportedOperationException("windows not yet implemented");
+      return "rm -f /etc/passwd.lock /etc/group.lock /etc/gshadow.lock";
+   }
+
+}
diff --git a/labs/virtualbox/src/main/resources/functions/installModuleAssistantIfNeeded.sh b/labs/virtualbox/src/main/resources/functions/installModuleAssistantIfNeeded.sh
index 87391c68de..a6b71f03ba 100644
--- a/labs/virtualbox/src/main/resources/functions/installModuleAssistantIfNeeded.sh
+++ b/labs/virtualbox/src/main/resources/functions/installModuleAssistantIfNeeded.sh
@@ -10,6 +10,5 @@ function installModuleAssistantIfNeeded {
       mkdir /etc/udev/rules.d/70-persistent-net.rules;
       rm -rf /dev/.udev/;
       rm /lib/udev/rules.d/75-persistent-net-generator.rules
-      rm -f /etc/passwd.lock /etc/group.lock /etc/gshadow.lock
    fi
 }
\ No newline at end of file