deflogin: explicit ROOTPW_EMPTY

This relates to commit f2892ad3 as there's an obvious need to be able to set empty root password for LiveCDs but previous implementation was very fragile (and is going to stay that way) -- so clear and separate knob for making an image defenseless looks better.

deflogin: explicit ROOTPW_EMPTY
0650f6d4 · Michael Shigorin · b9dffe21 · 0650f6d4 · 0650f6d4 · 0650f6d4
Commit 0650f6d4 authored Apr 12, 2014 by Michael Shigorin
Hide whitespace changes
Inline Side-by-side

Showing with 12 additions and 4 deletions

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

config.mk features.in/deflogin/config.mk +2 -2

50-root features.in/deflogin/rootfs/image-scripts.d/50-root +7 -1

No files found.
--- a/features.in/deflogin/README
+++ b/features.in/deflogin/README
 Эта фича конфигурирует root login и пользователей по умолчанию.
+
 Если ROOTPW не задан, то подходящий пароль не существует.
-Различить пустой и незаданный при текущей реализации xport() невозможно.
+При необходимости задать пустой пароль root (например, на LiveCD)
+выставьте переменную ROOTPW_EMPTY.

 ВНИМАНИЕ: применяйте разумно, т.к. крайне легко создать и оставить
          дыру в безопасности!
--- a/features.in/deflogin/config.mk
+++ b/features.in/deflogin/config.mk
@@ -2,6 +2,7 @@
 use/deflogin:
 	@$(call add_feature)
 	@$(call add,THE_PACKAGES,shadow-utils passwd)
+	@$(call xport,ROOTPW_EMPTY)
 	@$(call xport,ROOTPW)
 	@$(call xport,USERS)
 	@$(call xport,GROUPS)
@@ -12,8 +13,7 @@ use/deflogin:

 # livecd: root and altlinux users with no password at all
 use/deflogin/empty: use/deflogin use/deflogin/altlinux
-	@$(call set,ROOTPW,)
-	@$(call add,USERS,altlinux::1:1)
+	@$(call set,ROOTPW_EMPTY,1)

 # mostly used to allow access to videocard and desktop related hardware
 use/deflogin/xgrp: use/deflogin

--- a/features.in/deflogin/rootfs/image-scripts.d/50-root
+++ b/features.in/deflogin/rootfs/image-scripts.d/50-root
 #!/bin/sh
-# set root password if any; no-op if it is empty

+# explicitly requested empty root password
+if [ -n "$GLOBAL_ROOTPW_EMPTY" ]; then
+	usermod -p "" root
+	exit 0
+fi
+
+# set root password if any; no-op if it is empty
 if [ -z "$GLOBAL_ROOTPW" ]; then
 	echo "** warning: no root password provided, skipping" >&2
 else