Update lxd.patch (#45)

whywaita · Sep 27, 2024 · 26ef25e · 26ef25e
1 parent 960465c
commit 26ef25e
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/lxd.patch b/lxd.patch
@@ -67,7 +67,7 @@ index c8f2b682..1da414ab 100644
 +sudo -E invoke_tests "Tools" "Homebrew"
 +sudo rm -rf ${HOME}/.local
 diff --git a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl
-index 101c5a3b..6777ad78 100644
+index d8d821bc..813faf5e 100644
 --- a/images/ubuntu/templates/ubuntu-20.04.pkr.hcl
 +++ b/images/ubuntu/templates/ubuntu-20.04.pkr.hcl
 @@ -1,47 +1,12 @@
@@ -289,7 +289,7 @@ index 101c5a3b..6777ad78 100644
      execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
      inline          = [
 @@ -347,6 +262,13 @@ build {
-     scripts          = ["${path.root}/../scripts/build/install-docker-compose.sh", "${path.root}/../scripts/build/install-docker.sh"]
+     scripts          = ["${path.root}/../scripts/build/install-docker.sh"]
    }
 
 +  provisioner "shell" {
@@ -374,7 +374,7 @@ index 101c5a3b..6777ad78 100644
 -
  }
 diff --git a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl
-index 9b881a68..e8c573c6 100644
+index 6dd0abf1..350ccf03 100644
 --- a/images/ubuntu/templates/ubuntu-22.04.pkr.hcl
 +++ b/images/ubuntu/templates/ubuntu-22.04.pkr.hcl
 @@ -1,47 +1,12 @@
@@ -662,7 +662,7 @@ index 9b881a68..e8c573c6 100644
 -
  }
 diff --git a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
-index 650202b3..c16df112 100644
+index 634721eb..bfac4393 100644
 --- a/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
 +++ b/images/ubuntu/templates/ubuntu-24.04.pkr.hcl
 @@ -1,47 +1,12 @@
@@ -883,7 +883,7 @@ index 650202b3..c16df112 100644
    provisioner "shell" {
      execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"
      inline          = [
-@@ -325,6 +239,13 @@ provisioner "shell" {
+@@ -330,6 +244,13 @@ provisioner "shell" {
      scripts          = ["${path.root}/../scripts/build/install-docker.sh"]
    }
 
@@ -897,7 +897,7 @@ index 650202b3..c16df112 100644
    provisioner "shell" {
      environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
      execute_command  = "sudo sh -c '{{ .Vars }} pwsh -f {{ .Path }}'"
-@@ -339,7 +260,7 @@ provisioner "shell" {
+@@ -344,7 +265,7 @@ provisioner "shell" {
 
    provisioner "shell" {
      environment_vars = ["HELPER_SCRIPTS=${var.helper_script_folder}", "DEBIAN_FRONTEND=noninteractive", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}"]
@@ -906,7 +906,7 @@ index 650202b3..c16df112 100644
      scripts          = ["${path.root}/../scripts/build/install-homebrew.sh"]
    }
 
-@@ -362,22 +283,22 @@ provisioner "shell" {
+@@ -367,22 +288,22 @@ provisioner "shell" {
      start_retry_timeout = "10m"
    }
 
@@ -945,7 +945,7 @@ index 650202b3..c16df112 100644
 
    provisioner "shell" {
      environment_vars = ["HELPER_SCRIPT_FOLDER=${var.helper_script_folder}", "INSTALLER_SCRIPT_FOLDER=${var.installer_script_folder}", "IMAGE_FOLDER=${var.image_folder}"]
-@@ -387,7 +308,7 @@ provisioner "shell" {
+@@ -392,7 +313,7 @@ provisioner "shell" {
 
    provisioner "shell" {
      execute_command = "sudo sh -c '{{ .Vars }} {{ .Path }}'"