[PATCHv2] image: set the root password conditionally

[Henning Schild <henning.schild@siemens.com>]

If the root password was set by a hook script of a package, do not set
it in the configure script.
Add chpasswd to example-raw to demonstrate that.

Impact:
The default root password of images that include example-raw will
change.

Signed-off-by: Henning Schild <henning.schild@siemens.com>
---
 .../example-raw/{example-raw_0.1.bb => example-raw_0.2.bb}           | 5 ++++-
 meta-isar/recipes-core/images/files/debian-configscript.sh           | 3 ++-
 meta-isar/recipes-core/images/files/raspbian-configscript.sh         | 3 ++-
 3 files changed, 8 insertions(+), 3 deletions(-)
 rename meta-isar/recipes-app/example-raw/{example-raw_0.1.bb => example-raw_0.2.bb} (88%)

diff --git a/meta-isar/recipes-app/example-raw/example-raw_0.1.bb b/meta-isar/recipes-app/example-raw/example-raw_0.2.bb
similarity index 88%
rename from meta-isar/recipes-app/example-raw/example-raw_0.1.bb
rename to meta-isar/recipes-app/example-raw/example-raw_0.2.bb
index 08c7277..7dd343a 100644
--- a/meta-isar/recipes-app/example-raw/example-raw_0.1.bb
+++ b/meta-isar/recipes-app/example-raw/example-raw_0.2.bb
@@ -5,7 +5,7 @@
 
 DESCRIPTION = "Sample application for ISAR"
 MAINTAINER = "Your name here <you@domain.com>"
-DEBIAN_DEPENDS = "apt"
+DEBIAN_DEPENDS = "apt passwd"
 
 SRC_URI = "file://README \
 	   file://postinst"
@@ -28,6 +28,9 @@ do_install() {
 	bbnote "Now for a debian hook, see dpkg-deb"
 	install -v -m 755 ${WORKDIR}/postinst ${D}/DEBIAN/postinst
 
+	bbnote "Also change the root password"
+	echo 'echo "root:isar" | chpasswd' >> ${D}/DEBIAN/postinst
+
 	bbnote "Now for a fake config file"
 	echo "# empty config file" > ${WORKDIR}/${PN}.conf
 	install -v -d ${D}/usr/local/etc/
diff --git a/meta-isar/recipes-core/images/files/debian-configscript.sh b/meta-isar/recipes-core/images/files/debian-configscript.sh
index e2c03b5..698277c 100644
--- a/meta-isar/recipes-core/images/files/debian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/debian-configscript.sh
@@ -49,7 +49,8 @@ mount proc -t proc /proc
 dpkg --configure -a
 umount /proc
 
-echo "root:root" | chpasswd
+# set the root password if that has not been done before
+grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd
 
 cat > /etc/fstab << EOF
 # Begin /etc/fstab
diff --git a/meta-isar/recipes-core/images/files/raspbian-configscript.sh b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
index b1f8fd6..61a1aa5 100644
--- a/meta-isar/recipes-core/images/files/raspbian-configscript.sh
+++ b/meta-isar/recipes-core/images/files/raspbian-configscript.sh
@@ -53,7 +53,8 @@ mount proc -t proc /proc
 dpkg --configure -a
 umount /proc
 
-echo "root:root" | chpasswd
+# set the root password if that has not been done before
+grep "root:\*:" /etc/shadow && echo "root:root" | chpasswd
 
 cat > /etc/fstab << EOF
 # Begin /etc/fstab
-- 
2.13.6