From: David-John Willis <John.Willis@Distant-earth.com>
Date: Sat, 13 Feb 2010 22:11:36 +0000 (+0000)
Subject: pandora-xfce-image: Set IMAGE_LOGIN_MANAGER back to Busybox (i.e. default) for now.
X-Git-Tag: Release-2010-05/1~109
X-Git-Url: https://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d41ddae4fc5ccaa0dbe31334fe964a03cb3d251;p=openpandora.oe.git

pandora-xfce-image: Set IMAGE_LOGIN_MANAGER back to Busybox (i.e. default) for now.
---

diff --git a/recipes/images/pandora-xfce-image.bb b/recipes/images/pandora-xfce-image.bb
index 1346f6a..44e75e1 100755
--- a/recipes/images/pandora-xfce-image.bb
+++ b/recipes/images/pandora-xfce-image.bb
@@ -2,11 +2,11 @@
 
 IMAGE_LINGUAS = "de-de fr-fr en-gb en-us es-es"
 
-IMAGE_LOGIN_MANAGER = "shadow"
+#IMAGE_LOGIN_MANAGER = "shadow"
 
 inherit image
 
-PR = "r2"
+PR = "r6"
 
 export IMAGE_BASENAME = "pandora-xfce-image"
 
@@ -22,9 +22,6 @@ IMAGE_INSTALL += " \
 
 IMAGE_PREPROCESS_COMMAND = "create_etc_timestamp"
 
-#zap root password for release images
-#ROOTFS_POSTPROCESS_COMMAND += '${@base_conditional("DISTRO_TYPE", "release", "zap_root_password; ", "",d)}'
-
 # Helper to say what image we built, include GIT tag and image name.
 PANDORA_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/op-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${PANDORA_VERSION_FILE};cd $OLD_PWD;"