summaryrefslogtreecommitdiff
path: root/roles/install-config/templates
diff options
context:
space:
mode:
authorzsdc <taras@vyos.io>2020-02-24 23:42:19 +0200
committerzsdc <taras@vyos.io>2020-02-26 18:23:14 +0200
commit9fca551d381b1000d47d370dd3618172a1617fb4 (patch)
treed79001670319486f97ee76e3fce7e52c225164c6 /roles/install-config/templates
parent332dbe851c44543b69e516439baf203c9bebcadc (diff)
downloadvyos-vm-images-9fca551d381b1000d47d370dd3618172a1617fb4.tar.gz
vyos-vm-images-9fca551d381b1000d47d370dd3618172a1617fb4.zip
Fixes and additions in QEMU image building
* Fixed deleting APT lists from a cache to decrease resulting image size * Added option for creating an archive with files required for boot via PXE * Added option for keeping default user when creating an image with Cloud-init
Diffstat (limited to 'roles/install-config/templates')
-rw-r--r--roles/install-config/templates/config.boot.j22
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/install-config/templates/config.boot.j2 b/roles/install-config/templates/config.boot.j2
index 9b3e8ec..51e95b9 100644
--- a/roles/install-config/templates/config.boot.j2
+++ b/roles/install-config/templates/config.boot.j2
@@ -3,7 +3,7 @@ system {
login {
user vyos {
authentication {
-{% if cloud_init == "true" %}
+{% if cloud_init == "true" and not ( keep_user is defined and keep_user == "true" ) %}
encrypted-password "*"
{% else %}
encrypted-password "$6$MjV2YvKQ56q$QbL562qhRoyUu8OaqrXagicvcsNpF1HssCY06ZxxghDJkBCfSfTE/4FlFB41xZcd/HqYyVBuRt8Zyq3ozJ0dc."