Merge pull request #121 from scaleway/moul-patch-1

Do not store serial root password in standard user data
scaleway · Nov 24, 2015 · 3a1f042 · 3a1f042
2 parents b711147 + 7e03e1f
commit 3a1f042
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/Linux/README.md b/Linux/README.md
@@ -134,6 +134,7 @@ Here are the availble *initrd variables*:
 ### master (unreleased)
 
 * Speedup boot [#108](https://github.com/scaleway/initrd/issues/108)
+* Do not store serial root password in standard user data
 
 ### v3.5 (2015-11-19)
 

diff --git a/Linux/tree-common/init b/Linux/tree-common/init
@@ -201,9 +201,9 @@ if [[ "$?" -eq 0 || "$(get_any RESET_PASSWORD)" == "1" || -f "${rootmnt}/.scw-re
     log_end_msg
     # delete /.scw-reset-password-on-next-boot if it exists
     run rm -f "${rootmnt}/.scw-reset-password-on-next-boot"
-    if [ "$(get_opt NO_METADATA)" != "1" ]; then
-        scw-update-server-state -u "root_password=$PASSWORD"
-    fi
+    #if [ "$(get_opt NO_METADATA)" != "1" ]; then
+    #    scw-update-server-state -u "root_password=$PASSWORD"
+    #fi
 fi