From ed52399ef34c4ebb775c15832eef16eb10160057 Mon Sep 17 00:00:00 2001
From: dtookey <dtookey@jdsconsulting.net>
Date: Wed, 11 Sep 2024 16:22:41 -0400
Subject: [PATCH] moved the ubuntu iso autogeneration script into
 scripts/preseed/ where it belongs instead of in ubuntu/ where the configs are

---
 .gitignore                                            | 1 +
 {ubuntu => scripts/preseed}/autoinstaller-generate.sh | 7 ++-----
 scripts/preseed/generate_install_iso_ubuntu.sh        | 4 ++--
 scripts/preseed/local_iso.sh                          | 5 +++--
 4 files changed, 8 insertions(+), 9 deletions(-)
 create mode 100644 .gitignore
 rename {ubuntu => scripts/preseed}/autoinstaller-generate.sh (94%)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..567609b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+build/
diff --git a/ubuntu/autoinstaller-generate.sh b/scripts/preseed/autoinstaller-generate.sh
similarity index 94%
rename from ubuntu/autoinstaller-generate.sh
rename to scripts/preseed/autoinstaller-generate.sh
index a72a296..e73a0b5 100755
--- a/ubuntu/autoinstaller-generate.sh
+++ b/scripts/preseed/autoinstaller-generate.sh
@@ -236,6 +236,7 @@ else
         log "🤞 Skipping verification of source ISO."
 fi
 log "🔧 Extracting ISO image..."
+./xc.sh ${source_iso}
 xorriso -osirrox on -indev "${source_iso}" -extract / "$tmpdir" &>/dev/null
 chmod -R u+w "$tmpdir"
 rm -rf "$tmpdir/"'[BOOT]'
@@ -288,11 +289,7 @@ fi
 
 log "📦 Repackaging extracted files into an ISO image..."
 cd "$tmpdir"
-xorriso -as mkisofs -r -V 'Ubuntu-Server 24.04.1 LTS amd64' --modification-date='2024083109475700' --grub2-mbr --interval:local_fs:0s-15s:zero_mbrpt,zero_gpt:'/home/dtookey/build/ubuntu-original-2024-09-02.iso' --protective-msdos-label -partition_cyl_align off -partition_offset 16 --mbr-force-bootable -append_partition 2 28732ac11ff8d211ba4b00a0c93ec93b --interval:local_fs:5577512d-5587655d::'/home/dtookey/build/ubuntu-original-2024-09-02.iso' -appended_part_as_gpt -iso_mbr_part_type a2a0d0ebe5b9334487c068b6b72699c7 -c '/boot.catalog' -b '/boot/grub/i386-pc/eltorito.img' -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info -eltorito-alt-boot -e '--interval:appended_partition_2_start_1394378s_size_10144d:all::' -no-emul-boot -boot-load-size 10144 -o "${destination_iso}" . #&>/dev/null
-
-
-
-
+xorriso -as mkisofs -r -V 'Ubuntu-Server 24.04.1 LTS amd64' --modification-date='2024091107542800' --grub2-mbr --interval:local_fs:0s-15s:zero_mbrpt,zero_gpt:'/home/dtookey/infra/build/ubuntu-original-2024-09-11.iso' --protective-msdos-label -partition_cyl_align off -partition_offset 16 --mbr-force-bootable -append_partition 2 28732ac11ff8d211ba4b00a0c93ec93b --interval:local_fs:5526876d-5537019d::'/home/dtookey/infra/build/ubuntu-original-2024-09-11.iso' -appended_part_as_gpt -iso_mbr_part_type a2a0d0ebe5b9334487c068b6b72699c7 -c '/boot.catalog' -b '/boot/grub/i386-pc/eltorito.img' -no-emul-boot -boot-load-size 4 -boot-info-table --grub2-boot-info -eltorito-alt-boot -e '--interval:appended_partition_2_start_1381719s_size_10144d:all::' -no-emul-boot -boot-load-size 10144 -o "${destination_iso}" . #&>/dev/null
 
 
 cd "$OLDPWD"
diff --git a/scripts/preseed/generate_install_iso_ubuntu.sh b/scripts/preseed/generate_install_iso_ubuntu.sh
index f679cac..d89c84c 100755
--- a/scripts/preseed/generate_install_iso_ubuntu.sh
+++ b/scripts/preseed/generate_install_iso_ubuntu.sh
@@ -18,7 +18,7 @@ while getopts "n:" opt; do
   esac
 done
 
-rsync -avP ubuntu/autoinstaller-generate.sh atlas:/olympus/samba/linux/ag.sh
-rsync -avP "ubuntu/user-data.${HOST_NAME}.yaml" atlas:/olympus/samba/linux/user-data || exit
+rsync -avP scripts/preseed/autoinstaller-generate.sh atlas:/olympus/samba/linux/ag.sh
+rsync -avP "scripts/preseed/user-data.${HOST_NAME}.yaml" atlas:/olympus/samba/linux/user-data || exit
 
 ssh -t atlas "cd /olympus/samba/linux && sudo chmod a+x ./ag.sh && ./ag.sh -a -u ./user-data -d ${HOST_NAME}.iso && rm ag.sh user-data"
diff --git a/scripts/preseed/local_iso.sh b/scripts/preseed/local_iso.sh
index e334433..5936d11 100755
--- a/scripts/preseed/local_iso.sh
+++ b/scripts/preseed/local_iso.sh
@@ -26,6 +26,7 @@ cd $BUILD_ROOT || exit
 rm ${HOST_NAME}.iso || true
 sudo chown dtookey:dtookey  ./*
 
-rsync -avP "$PROJECT_ROOT/ubuntu/autoinstaller-generate.sh" ./ag.sh
-chmod a+x ./ag.sh
+rsync -avP "$PROJECT_ROOT/scripts/preseed/autoinstaller-generate.sh" ./ag.sh
+rsync -avP "$PROJECT_ROOT/scripts/preseed/xorriso_cmd.sh" ./xc.sh
+chmod a+x ./ag.sh ./xc.sh
 ./ag.sh -a -u ${PROJECT_ROOT}/ubuntu/user-data.${HOST_NAME}.yaml -d ${HOST_NAME}.iso