From ccb37e5af6f11fa677c1cb40a10a00102b4359c4 Mon Sep 17 00:00:00 2001
From: Tanguy Herbron <tanguy.herbron@outlook.com>
Date: Mon, 23 May 2022 12:13:27 +0200
Subject: [PATCH] Fix preseeding procedure

---
 .gitlab-ci.yml                              | 5 ++---
 {debian => bootloader-configs}/isolinux.cfg | 0
 {debian => bootloader-configs}/menu.cfg     | 0
 {debian => bootloader-configs}/txt.cfg      | 0
 debian/preseed.cfg => preseed.cfg           | 0
 5 files changed, 2 insertions(+), 3 deletions(-)
 rename {debian => bootloader-configs}/isolinux.cfg (100%)
 rename {debian => bootloader-configs}/menu.cfg (100%)
 rename {debian => bootloader-configs}/txt.cfg (100%)
 rename debian/preseed.cfg => preseed.cfg (100%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b713d54..077b4d1 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,13 +7,12 @@ build-images:
     script:
       - apt update
       - apt install -y xorriso curl genisoimage cpio
-      - ls
       - curl -O https://laotzu.ftp.acc.umu.se/debian-cd/current/amd64/iso-cd/debian-11.3.0-amd64-netinst.iso
       - xorriso -osirrox on -indev debian-11.3.0-amd64-netinst.iso -extract / ./isofiles
       - chmod +w -R isofiles/
       - gunzip ./isofiles/install.amd/initrd.gz
-      - echo debian/preseed.cfg | cpio -H newc -o -A -F isofiles/install.amd/initrd
-      - cp debian/*.cfg isofiles/isolinux
+      - echo preseed.cfg | cpio -H newc -o -A -F isofiles/install.amd/initrd
+      - cp bootloader-configs/*.cfg isofiles/isolinux
       - gzip isofiles/install.amd/initrd
       - cd isofiles
         # Execute the md5sum generation in a separated shell instance, because it returns a
diff --git a/debian/isolinux.cfg b/bootloader-configs/isolinux.cfg
similarity index 100%
rename from debian/isolinux.cfg
rename to bootloader-configs/isolinux.cfg
diff --git a/debian/menu.cfg b/bootloader-configs/menu.cfg
similarity index 100%
rename from debian/menu.cfg
rename to bootloader-configs/menu.cfg
diff --git a/debian/txt.cfg b/bootloader-configs/txt.cfg
similarity index 100%
rename from debian/txt.cfg
rename to bootloader-configs/txt.cfg
diff --git a/debian/preseed.cfg b/preseed.cfg
similarity index 100%
rename from debian/preseed.cfg
rename to preseed.cfg