[2.0] Cherry-pick credscan failure caused by unattended installer ima…

…ge config (#2908) * minor fix to build doc (#2907) Co-authored-by: Henry Li <[email protected]> * fix image config json (#2906) Co-authored-by: Henry Li <[email protected]> Co-authored-by: Henry Li <[email protected]>
microsoft · Apr 27, 2022 · eaef6f2 · eaef6f2
1 parent ef5e766
commit eaef6f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 10 deletions.
diff --git a/toolkit/docs/building/building.md b/toolkit/docs/building/building.md
@@ -209,7 +209,7 @@ sudo make iso CONFIG_FILE=./imageconfigs/full.json REBUILD_TOOLS=y
 To create an unattended ISO installer (no interactive UI) use `UNATTENDED_INSTALLER=y` and run with a [`CONFIG_FILE`](https://github.com/microsoft/CBL-MarinerDemo#image-config-file) that only specifies a _single_ SystemConfig.
 
 ```bash
-# Build the standard ISO with unattended installer that installs onto the default Gen1 HyperV VM
+# Build the standard ISO with unattended installer that installs onto the default Gen1 HyperV VM. Needs to cloud-init provision the user once unattended installation finishes.
 sudo make iso -j$(nproc) CONFIG_FILE=./imageconfigs/core-legacy-unattended-hyperv.json REBUILD_TOOLS=y UNATTENDED_INSTALLER=y
 ```
 

diff --git a/toolkit/imageconfigs/core-legacy-unattended-hyperv.json b/toolkit/imageconfigs/core-legacy-unattended-hyperv.json
@@ -47,15 +47,7 @@
             "KernelOptions": {
                 "default": "kernel"
             },
-            "Hostname": "cbl-mariner",
-            "Users": [
-                {
-                    "Name": "root",
-                    "Password": "$6$20m6y6nwlU1K$hKgyNYjVSKPJOTFaAzAf/fwACUV/dZ1NPy5cGNkhvRzKJiKDBKofuvDpdl81Jak4ep756DnZmVm7JfGRMO/n90",
-                    "PasswordHashed": true,
-                    "_comment": "The password is 'p@ssw0rd', this should be regenerated with 'openssl passwd -6 -salt <YOUR_SALT> <YOUR_PASSWORD>', or use the json key 'SSHPubKeyPaths' to use an SSH key for login"
-                }
-            ]
+            "Hostname": "cbl-mariner"
         }
     ]
 }