From b98b191b5cb628ed8dd32236c4b08d025b65941f Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 5 Jan 2013 04:52:02 +0000 Subject: system: set root password only for default skeleton In case one is using a custom skeleton, the root pasword might already be set in this case, and should not be overriden. Just ask for (and set) the root password only for the default skeleton. Reported-by: Gustavo Zacarias Signed-off-by: "Yann E. MORIN" Cc: Peter Korsgaard Signed-off-by: Peter Korsgaard --- system/Config.in | 42 +++++++++++++++++++++--------------------- system/system.mk | 2 ++ 2 files changed, 23 insertions(+), 21 deletions(-) (limited to 'system') diff --git a/system/Config.in b/system/Config.in index 5b66ac0fb..19bdd2d74 100644 --- a/system/Config.in +++ b/system/Config.in @@ -12,27 +12,6 @@ config BR2_TARGET_GENERIC_ISSUE help Select system banner (/etc/issue) to be displayed at login. -config BR2_TARGET_GENERIC_ROOT_PASSWD - string "Root password" - default "" - help - Set the initial root password (in clear). It will be md5-encrypted. - - If set to empty (the default), then no root password will be set, - and root will need no password to log in. - - WARNING! WARNING! - Although pretty strong, MD5 is now an old hash function, and - suffers from some weaknesses, which makes it susceptible to attacks. - It is showing its age, so this root password should not be trusted - to properly secure any product that can be shipped to the wide, - hostile world. - - WARNING! WARNING! - The password appears in clear in the .config file, and may appear - in the build log! Avoid using a valuable password if either the - .config file or the build log may be distributed! - choice prompt "/dev management" default BR2_ROOTFS_DEVICE_CREATION_STATIC @@ -140,6 +119,27 @@ endif if BR2_ROOTFS_SKELETON_DEFAULT +config BR2_TARGET_GENERIC_ROOT_PASSWD + string "Root password" + default "" + help + Set the initial root password (in clear). It will be md5-encrypted. + + If set to empty (the default), then no root password will be set, + and root will need no password to log in. + + WARNING! WARNING! + Although pretty strong, MD5 is now an old hash function, and + suffers from some weaknesses, which makes it susceptible to attacks. + It is showing its age, so this root password should not be trusted + to properly secure any product that can be shipped to the wide, + hostile world. + + WARNING! WARNING! + The password appears in clear in the .config file, and may appear + in the build log! Avoid using a valuable password if either the + .config file or the build log may be distributed! + config BR2_TARGET_GENERIC_GETTY_PORT string "Port to run a getty (login prompt) on" default "ttyS0" diff --git a/system/system.mk b/system/system.mk index 3c4d06e69..651f7df0f 100644 --- a/system/system.mk +++ b/system/system.mk @@ -47,7 +47,9 @@ ifneq ($(TARGET_GENERIC_ISSUE),) TARGETS += target-generic-issue endif +ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) TARGETS += target-root-passwd +endif ifneq ($(TARGET_GENERIC_GETTY),) ifeq ($(BR2_ROOTFS_SKELETON_DEFAULT),y) -- cgit v1.2.3