Add some fixes which were not commited yet

[people/jschlag/ipfire-3.x-image.git] / generate_image.sh

diff --git a/generate_image.sh b/generate_image.sh
index d037bc1436cffb68ac0bc94e72e868ab6581aa90..756615f154672ede3557356c8afd15d41a9eae9f 100755 (executable)
--- a/generate_image.sh
+++ b/generate_image.sh
@@ -56,7 +56,7 @@ cmd() {
        esac
 }
 
-cleanup() {
+cleanup_stage_1() {
        # Unmount image
        umount ${IMAGE_MOUNT_DIR}
 
@@ -65,7 +65,9 @@ cleanup() {
 
        # Remove loopback device
        losetup -d ${outlo}
+}
 
+cleanup_stage_2() {
        # Drop working dir
        if [ -d "${WORKING_DIR}" ]; then
                rm -dfR "${WORKING_DIR}"
@@ -174,7 +176,7 @@ publish() {
        local compression_level=1
 
        if [[ ${IMAGE_RELEASE} -eq ${TRUE} ]]; then
-               compression_level=9
+               compression_level=1
        fi
 
        # Do these steps for every image format we like to publish
@@ -284,7 +286,7 @@ log DEBUG "Working dir is ${WORKING_DIR}"
 #
 
 IMAGE_BASE_FILE="$(mktemp -u ${WORKING_DIR}/image_base_file.XXXXXXX.img)"
-IMAGE_SIZE="8100"
+IMAGE_SIZE="7500"
 IMAGE_MOUNT_DIR="$(mktemp -d ${WORKING_DIR}/image.XXXXXXX)"
 
 IMAGE_TYPES_PUBLISH="qcow2 vmdk vdi img"
@@ -474,7 +476,9 @@ fi
 FS_UUID=$(blkid -o value -s UUID ${outlo}p1)
 
 # Write fstab.
-echo "UUID=${FS_UUID} / ${FILESYSTEM} defaults 0 0" > ${IMAGE_MOUNT_DIR}/etc/fstab
+echo "UUID=${FS_UUID} / ${FILESYSTEM} defaults 0 0" > "${IMAGE_MOUNT_DIR}/etc/fstab"
+
+cat  "${IMAGE_MOUNT_DIR}/etc/fstab"
 
 #
 ## Remove the password for user root.
@@ -529,6 +533,10 @@ sed -i "${IMAGE_MOUNT_DIR}/boot/grub2/grub.cfg" \
                -e "s/root=[A-Za-z0-9\/=-]*/root=UUID=${FS_UUID}/g"
 
 cat "${IMAGE_MOUNT_DIR}/boot/grub2/grub.cfg"
+
+cat  "${IMAGE_MOUNT_DIR}/etc/fstab"
+
+
 #
 ## Tidy up.
 #
@@ -539,7 +547,9 @@ sleep 5
 # Check filesystem for damage.
 fsck.${FILESYSTEM} ${outlo}p1
 
+cleanup_stage_1
+
 publish "/home/jschlag/public/ipfire3-images" "${IMAGE_BASE_FILE}"
 
 # Cleanup
-cleanup
+cleanup_stage_2