From fd0c03fcb052bb0a2bd2bc7f7ec828305ed71b69 Mon Sep 17 00:00:00 2001
From: Alan Baghumian <alan.baghumian@canonical.com>
Date: Mon, 20 Nov 2023 12:06:56 -0800
Subject: [PATCH] Moved scripts out of debian/scripts/cloudimg to the parent
 directory.

---
 debian/debian-cloudimg.pkr.hcl                         | 10 +++++-----
 debian/scripts/{cloudimg => }/cleanup.sh               |  0
 debian/scripts/{cloudimg => }/curtin-hooks             |  0
 debian/scripts/{cloudimg => }/install-custom-kernel.sh |  0
 debian/scripts/{cloudimg => }/setup-boot.sh            |  0
 debian/scripts/{cloudimg => }/setup-curtin.sh          |  0
 6 files changed, 5 insertions(+), 5 deletions(-)
 rename debian/scripts/{cloudimg => }/cleanup.sh (100%)
 rename debian/scripts/{cloudimg => }/curtin-hooks (100%)
 rename debian/scripts/{cloudimg => }/install-custom-kernel.sh (100%)
 rename debian/scripts/{cloudimg => }/setup-boot.sh (100%)
 rename debian/scripts/{cloudimg => }/setup-curtin.sh (100%)

diff --git a/debian/debian-cloudimg.pkr.hcl b/debian/debian-cloudimg.pkr.hcl
index a18817f5..c38d663a 100644
--- a/debian/debian-cloudimg.pkr.hcl
+++ b/debian/debian-cloudimg.pkr.hcl
@@ -79,7 +79,7 @@ build {
 
   provisioner "shell" {
     environment_vars = concat(local.proxy_env, ["DEBIAN_FRONTEND=noninteractive", "DEBIAN_VERSION=${var.debian_version}", "BOOT_MODE=${var.boot_mode}"])
-    scripts          = ["${path.root}/scripts/cloudimg/setup-boot.sh", "${path.root}/scripts/networking.sh"]
+    scripts          = ["${path.root}/scripts/setup-boot.sh", "${path.root}/scripts/networking.sh"]
   }
 
   provisioner "shell" {
@@ -93,22 +93,22 @@ build {
       "CLOUDIMG_CUSTOM_KERNEL=${var.kernel}",
       "DEBIAN_FRONTEND=noninteractive"
     ]
-    scripts = ["${path.root}/scripts/cloudimg/install-custom-kernel.sh"]
+    scripts = ["${path.root}/scripts/install-custom-kernel.sh"]
   }
 
   provisioner "file" {
     destination = "/tmp/"
-    sources     = ["${path.root}/scripts/cloudimg/curtin-hooks"]
+    sources     = ["${path.root}/scripts/curtin-hooks"]
   }
 
   provisioner "shell" {
     environment_vars = ["CLOUDIMG_CUSTOM_KERNEL=${var.kernel}"]
-    scripts          = ["${path.root}/scripts/cloudimg/setup-curtin.sh"]
+    scripts          = ["${path.root}/scripts/setup-curtin.sh"]
   }
 
   provisioner "shell" {
     environment_vars = ["DEBIAN_FRONTEND=noninteractive"]
-    scripts          = ["${path.root}/scripts/cloudimg/cleanup.sh"]
+    scripts          = ["${path.root}/scripts/cleanup.sh"]
   }
 
   post-processor "shell-local" {
diff --git a/debian/scripts/cloudimg/cleanup.sh b/debian/scripts/cleanup.sh
similarity index 100%
rename from debian/scripts/cloudimg/cleanup.sh
rename to debian/scripts/cleanup.sh
diff --git a/debian/scripts/cloudimg/curtin-hooks b/debian/scripts/curtin-hooks
similarity index 100%
rename from debian/scripts/cloudimg/curtin-hooks
rename to debian/scripts/curtin-hooks
diff --git a/debian/scripts/cloudimg/install-custom-kernel.sh b/debian/scripts/install-custom-kernel.sh
similarity index 100%
rename from debian/scripts/cloudimg/install-custom-kernel.sh
rename to debian/scripts/install-custom-kernel.sh
diff --git a/debian/scripts/cloudimg/setup-boot.sh b/debian/scripts/setup-boot.sh
similarity index 100%
rename from debian/scripts/cloudimg/setup-boot.sh
rename to debian/scripts/setup-boot.sh
diff --git a/debian/scripts/cloudimg/setup-curtin.sh b/debian/scripts/setup-curtin.sh
similarity index 100%
rename from debian/scripts/cloudimg/setup-curtin.sh
rename to debian/scripts/setup-curtin.sh