summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkwadronaut <kwadronaut@leap.se>2016-12-05 00:05:40 +0100
committerkwadronaut <kwadronaut@leap.se>2016-12-05 00:09:06 +0100
commitfa8a55d42333d341e1492e68c40c47b4d76666ed (patch)
treeed2986509e16bbed743c96f2897561e221326b91
parent5b9006e02ef71dffb244278243963015be065d3f (diff)
virtualbox packer must use sudo whenever root privs are required
-rw-r--r--jessie.json12
-rw-r--r--scripts/zerodisk.sh2
2 files changed, 11 insertions, 3 deletions
diff --git a/jessie.json b/jessie.json
index d76653d..142d503 100644
--- a/jessie.json
+++ b/jessie.json
@@ -17,13 +17,21 @@
{
"type": "file",
"source": "files/leap-archive.gpg",
- "destination": "/etc/apt/trusted.gpg.d/leap-archive.gpg"
+ "destination": "/tmp/leap-archive.gpg"
},
{
"type": "file",
"source": "files/leap-experimental-archive.gpg",
- "destination": "/etc/apt/trusted.gpg.d/leap-experimental-archive.gpg"
+ "destination": "/tmp/leap-experimental-archive.gpg"
},
+ {
+ "type": "shell",
+ "inline": [
+ "echo {{user `password`}} | sudo -S cp /tmp/leap-archive.gpg /etc/apt/trusted.gpg.d/leap-archive.gpg",
+ "sudo cp /tmp/leap-experimental-archive.gpg /etc/apt/trusted.gpg.d/leap-experimental-archive.gpg",
+ "sudo chown root:root /etc/apt/trusted.gpg.d/leap-archive.gpg /etc/apt/trusted.gpg.d/leap-experimental-archive.gpg"
+ ]
+ },
{
"type": "shell",
"scripts": [
diff --git a/scripts/zerodisk.sh b/scripts/zerodisk.sh
index 35370d6..530ca4d 100644
--- a/scripts/zerodisk.sh
+++ b/scripts/zerodisk.sh
@@ -1,7 +1,7 @@
#!/bin/bash
# Zero out the free space to save space in the final image:
-dd if=/dev/zero of=/EMPTY bs=1M
+dd if=/dev/zero of=/tmp/EMPTY bs=1M
rm -f /EMPTY
# Sync to ensure that the delete completes before this moves on.