From 8023952876705ac8f55f171dc11226e3a2ae6445 Mon Sep 17 00:00:00 2001
From: Aleksandr Chebotov <v-aleche@microsoft.com>
Date: Fri, 14 Feb 2020 14:43:30 +0300
Subject: [PATCH] add ImageOS env variable

---
 images/linux/ubuntu1604.json      | 4 +++-
 images/linux/ubuntu1804.json      | 4 +++-
 images/win/Windows2016-Azure.json | 4 +++-
 images/win/Windows2019-Azure.json | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/images/linux/ubuntu1604.json b/images/linux/ubuntu1604.json
index 6cef1b7f..544d4ba5 100644
--- a/images/linux/ubuntu1604.json
+++ b/images/linux/ubuntu1604.json
@@ -21,6 +21,7 @@
         "vm_size": "Standard_DS2_v2",
         "capture_name_prefix": "packer",
         "image_version": "dev",
+        "image_os": "ubuntu16",
         "github_feed_token": null
     },
     "sensitive-variables": ["client_secret", "github_feed_token"],
@@ -109,7 +110,8 @@
         {
             "type": "shell",
             "inline": [
-                "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment"
+                "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment",
+                "echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
diff --git a/images/linux/ubuntu1804.json b/images/linux/ubuntu1804.json
index fde3d240..adcce5c8 100644
--- a/images/linux/ubuntu1804.json
+++ b/images/linux/ubuntu1804.json
@@ -21,6 +21,7 @@
         "vm_size": "Standard_DS2_v2",
         "capture_name_prefix": "packer",
         "image_version": "dev",
+        "image_os": "ubuntu18",
         "github_feed_token": null
     },
     "sensitive-variables": ["client_secret", "github_feed_token"],
@@ -112,7 +113,8 @@
         {
             "type": "shell",
             "inline": [
-                "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment"
+                "echo ImageVersion={{user `image_version`}} | tee -a /etc/environment",
+                "echo ImageOS={{user `image_os`}} | tee -a /etc/environment"
             ],
             "execute_command": "sudo sh -c '{{ .Vars }} {{ .Path }}'"
         },
diff --git a/images/win/Windows2016-Azure.json b/images/win/Windows2016-Azure.json
index 98d96feb..aed834d5 100644
--- a/images/win/Windows2016-Azure.json
+++ b/images/win/Windows2016-Azure.json
@@ -26,6 +26,7 @@
         "install_password": null,
         "capture_name_prefix": "packer",
         "image_version": "dev",
+        "image_os": "win16",
         "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}"
     },
     "sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
@@ -115,7 +116,8 @@
         {
             "type": "powershell",
             "inline": [
-              "setx ImageVersion {{user `image_version` }} /m"
+              "setx ImageVersion {{user `image_version` }} /m",
+              "setx ImageOS {{user `image_os` }} /m"
             ]
         },
         {
diff --git a/images/win/Windows2019-Azure.json b/images/win/Windows2019-Azure.json
index 46792679..5704604a 100644
--- a/images/win/Windows2019-Azure.json
+++ b/images/win/Windows2019-Azure.json
@@ -26,6 +26,7 @@
         "install_password": null,
         "capture_name_prefix": "packer",
         "image_version": "dev",
+        "image_os": "win19",
         "github_feed_token": "{{env `GITHUB_FEED_TOKEN`}}"
     },
     "sensitive-variables": ["install_password", "ssh_password", "client_secret", "github_feed_token"],
@@ -115,7 +116,8 @@
         {
             "type": "powershell",
             "inline": [
-              "setx ImageVersion {{user `image_version` }} /m"
+              "setx ImageVersion {{user `image_version` }} /m",
+              "setx ImageOS {{user `image_os` }} /m"
             ]
         },
         {