summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--classes/image_ipk.oeclass12
-rw-r--r--meta/gpe-image.oe4
-rw-r--r--meta/opie-image.oe4
3 files changed, 16 insertions, 4 deletions
diff --git a/classes/image_ipk.oeclass b/classes/image_ipk.oeclass
index 7821aa6c6d..f0fb5ec483 100644
--- a/classes/image_ipk.oeclass
+++ b/classes/image_ipk.oeclass
@@ -69,4 +69,16 @@ EOF
oeimage -t ${IMAGE_FSTYPE} -e ${FILE}
fi
}
+
+# set '*' as the rootpassword so the images
+# can decide if they want it or not
+
+zap_root_password () {
+ sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
+ mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
+}
+
+# export the zap_root_password
+EXPORT_FUNCTIONS zap_root_password
+
addtask images before do_build after do_install
diff --git a/meta/gpe-image.oe b/meta/gpe-image.oe
index 04d830c775..0b1c927d17 100644
--- a/meta/gpe-image.oe
+++ b/meta/gpe-image.oe
@@ -8,10 +8,6 @@ export IPKG_INSTALL = 'task-bootstrap xserver-kdrive-fbdev \
gpe ttf-bitstream-vera pango-module-basic-x pango-module-basic-fc \
glibc-gconv glibc-gconv-iso8859-1 gdk-pixbuf-loader-png'
-zap_root_password () {
- sed 's%^root:[^:]*:%root:*:%' < ${IMAGE_ROOTFS}/etc/passwd >${IMAGE_ROOTFS}/etc/passwd.new
- mv ${IMAGE_ROOTFS}/etc/passwd.new ${IMAGE_ROOTFS}/etc/passwd
-}
IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
diff --git a/meta/opie-image.oe b/meta/opie-image.oe
index b785b8f94e..731d6aa000 100644
--- a/meta/opie-image.oe
+++ b/meta/opie-image.oe
@@ -60,4 +60,8 @@ DEPENDS = "task-bootstrap ${OPIE_LIBS_DEPEND} ${OPIE_BASE} ${OPIE_BASE_APPLETS}
${OPIE_EXTRA_APPLETS} ${OPIE_EXTRA_SETTINGS} ${OPIE_EXTRA_APPS} \
${OPIE_BASE_STYLES} ${OPIE_BASE_DECOS} ${OPIE_BASE_INPUTMETHODS}"
+
+# zap the root password
+#IMAGE_POSTPROCESS_COMMAND = "zap_root_password"
+
inherit image_ipk