deflogin: more explicit ROOTPW_EMPTY handling

This should avoid ruining principle of the least surprise with ROOTPW_EMPTY=0 or ROOTPW_EMPTY=n actually *enabling* empty root password; overriding an already set "1" with "0" becomes possible either.

deflogin: more explicit ROOTPW_EMPTY handling
2fa72595 · Michael Shigorin · 3c95cf8d · 2fa72595 · 2fa72595
Commit 2fa72595 authored Sep 18, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

README features.in/deflogin/README +1 -1

50-root features.in/deflogin/rootfs/image-scripts.d/50-root +4 -2

No files found.
--- a/features.in/deflogin/README
+++ b/features.in/deflogin/README
@@ -2,7 +2,7 @@
 Если ROOTPW не задан, то подходящий пароль не существует.
 При необходимости задать пустой пароль root (например, на LiveCD)
-выставьте переменную ROOTPW_EMPTY.
+выставьте переменную ROOTPW_EMPTY в значение "1".
 ВНИМАНИЕ: применяйте разумно, т.к. крайне легко создать и оставить
          дыру в безопасности!
--- a/features.in/deflogin/rootfs/image-scripts.d/50-root
+++ b/features.in/deflogin/rootfs/image-scripts.d/50-root
 #!/bin/sh
 # explicitly requested empty root password
-if [ -n "$GLOBAL_ROOTPW_EMPTY" ]; then
+case "$GLOBAL_ROOTPW_EMPTY" in
+1|y|Y|yes)
 	usermod -p "" root
 	exit 0
-fi
+	;;
+esac
 # set root password if any; no-op if it is empty
 if [ -z "$GLOBAL_ROOTPW" ]; then