feat: make prompt reconcile opt-in

ublue-os · Feb 2, 2024 · 2578813 · 2578813
1 parent e0b87e6
commit 2578813
Show file tree

Hide file tree

Showing 18 changed files with 132 additions and 2 deletions.
diff --git a/blincus b/blincus
@@ -895,6 +895,7 @@ write_defaults() {
 	config_set "default_home-mounts" "none"
 	config_set "default_vm_image" "images:ubuntu/mantic/cloud"
 	config_set "default_vm_profiles" "idmap,vmkeys"
+	config_set "prompt_integration" "false"
 
 	# ubuntu defaults
 	config_set "ubuntu.image" "images:ubuntu/jammy/cloud"
@@ -2675,7 +2676,10 @@ initialize() {
 
   #personalize
   profiles
-  prompt_reconcile
+  doprompt=$(config_get "prompt_integration" "false")
+  if [ ! $doprompt == "false" ]; then
+  	prompt_reconcile
+  fi
 
 }
 

diff --git a/recipes/0-jammybase.pkr.hcl b/recipes/0-jammybase.pkr.hcl
@@ -1,3 +1,12 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
+
 source "incus" "jammybase" {
   image        = "images:ubuntu/jammy"
   output_image = "jammybase"

diff --git a/recipes/1-jammydev.pkr.hcl b/recipes/1-jammydev.pkr.hcl
@@ -1,3 +1,12 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
+
 source "incus" "jammydev" {
   image        = "jammybase"
   output_image = "jammydev"

diff --git a/recipes/2-jammydevx.pkr.hcl b/recipes/2-jammydevx.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "jammydevx" {
   image        = "jammydev"
   output_image = "jammydevx"

diff --git a/recipes/bullseye.pkr.hcl b/recipes/bullseye.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "bullseye" {
   image        = "images:debian/bullseye"
   output_image = "debian-bullseye"

diff --git a/recipes/debian.pkr.hcl b/recipes/debian.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "bookworm" {
   image        = "images:debian/bookworm"
   output_image = "debian-bookworm"

diff --git a/recipes/jammy.pkr.hcl b/recipes/jammy.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "jammy" {
   image        = "images:ubuntu/jammy"
   output_image = "ubuntu-jammy"

diff --git a/recipes/jammyvm.pkr.hcl b/recipes/jammyvm.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "jammy" {
   image        = "images:ubuntu/jammy"
   output_image = "jammyvm"

diff --git a/recipes/jammyx.pkr.hcl b/recipes/jammyx.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "jammyx" {
   image        = "images:ubuntu/jammy"
   output_image = "ubuntu-jammyx"

diff --git a/recipes/lunarvm.pkr.hcl b/recipes/lunarvm.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "lunar" {
   image        = "images:ubuntu/lunar"
   output_image = "lunarvm"

diff --git a/recipes/mantic.pkr.hcl b/recipes/mantic.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "mantic" {
   image        = "images:ubuntu/mantic"
   output_image = "ubuntu-mantic"

diff --git a/recipes/manticvm.pkr.hcl b/recipes/manticvm.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "mantic" {
   image        = "images:ubuntu/mantic"
   output_image = "manticvm"

diff --git a/recipes/manticvmd.pkr.hcl b/recipes/manticvmd.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "mantic" {
   image        = "images:ubuntu/mantic/desktop"
   output_image = "manticvmd"

diff --git a/recipes/manticx.pkr.hcl b/recipes/manticx.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "manticx" {
   image        = "images:ubuntu/mantic"
   output_image = "ubuntu-manticx"

diff --git a/recipes/nix.pkr.hcl b/recipes/nix.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "nix" {
   image = "images:ubuntu/jammy"
   output_image = "ubuntu-nix"

diff --git a/recipes/ubuntults.pkr.hcl b/recipes/ubuntults.pkr.hcl
@@ -1,3 +1,11 @@
+packer {
+  required_plugins {
+    incus = {
+      version = ">= 1.0.4"
+      source  = "github.com/bketelsen/incus"
+    }
+  }
+}
 source "incus" "focal" {
   image        = "images:ubuntu/focal"
   output_image = "focalp"

diff --git a/src/initialize.sh b/src/initialize.sh
@@ -13,4 +13,7 @@ fi
 
 #personalize
 profiles
-prompt_reconcile
+doprompt=$(config_get "prompt_integration" "false")
+if [ ! $doprompt == "false" ]; then
+	prompt_reconcile
+fi
diff --git a/src/lib/defaults.sh b/src/lib/defaults.sh
@@ -9,6 +9,7 @@ write_defaults() {
 	config_set "default_home-mounts" "none"
 	config_set "default_vm_image" "images:ubuntu/mantic/cloud"
 	config_set "default_vm_profiles" "idmap,vmkeys"
+	config_set "prompt_integration" "false"
 
 	# ubuntu defaults
 	config_set "ubuntu.image" "images:ubuntu/jammy/cloud"