Update patch of diskimage-builder

The file being patched was changed by
I451d24bdd6fa0983414244135dff5e96c0549833

Also no longer move firstboot log.

Change-Id: I4d3484f270a09f10dbc4c448cf8b1dd360754899
This commit is contained in:
Derek Higgins 2013-09-02 10:37:27 +01:00
parent f2701b8fc7
commit 28477daeb8
1 changed files with 7 additions and 20 deletions

View File

@ -10,15 +10,14 @@ o mv first-boot scripts instead of rm
place this file in patches.
---
bin/disk-image-create | 8 ++++++++
elements/base/dib-first-boot | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
bin/disk-image-create | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/bin/disk-image-create b/bin/disk-image-create
index efbcf85..e7fc46f 100755
index de14433..fba1e1e 100755
--- a/bin/disk-image-create
+++ b/bin/disk-image-create
@@ -97,6 +97,13 @@ arg_to_elements "$@"
@@ -105,6 +105,13 @@ arg_to_elements "$@"
IMAGE_NAME=${IMAGE_NAME%%\.${IMAGE_TYPE}}
@ -32,26 +31,14 @@ index efbcf85..e7fc46f 100755
mk_build_dir
create_base
run_d extra-data
@@ -144,6 +151,7 @@ unmount_image
@@ -151,6 +158,7 @@ unmount_image
if [ "$IS_RAMDISK" == "0" ]; then
compress_image
save_image $IMAGE_NAME.$IMAGE_TYPE
compress_and_save_image $IMAGE_NAME.$IMAGE_TYPE
+ cp $IMAGE_NAME.$IMAGE_TYPE $TOCI_WORKING_DIR/image_cache/$(basename $IMAGE_NAME.$IMAGE_TYPE)
else
remove_image
fi
diff --git a/elements/base/dib-first-boot b/elements/base/dib-first-boot
index 1e39860..c13a930 100755
--- a/elements/base/dib-first-boot
+++ b/elements/base/dib-first-boot
@@ -6,6 +6,6 @@ touch /var/log/first-boot.d.log
chmod 0600 /var/log/first-boot.d.log
/usr/local/bin/dib-run-parts /etc/first-boot.d >> /var/log/first-boot.d.log 2>&1
-rm -fr /etc/first-boot.d
+mv /etc/first-boot.d /etc/first-boot.d_
# delete itself
rm $0
--
1.8.1.4