Merge bk://openembedded@openembedded.bkbits.net/packages

into home.hrw.one.pl:/home/szczepan/zaurus/oe/packages

2004/06/03 23:31:54+02:00 hrw.one.pl!hrw
few fixes to get things running right during boot

BKrev: 40bf98f5h9CB3YxfLiHYB7PCYOs3fw

diff --git a/base-files/base-files_3.0.14.oe b/base-files/base-files_3.0.14.oe
index 6bbd9c1..16d7568 100644 (file)
--- a/base-files/base-files_3.0.14.oe
+++ b/base-files/base-files_3.0.14.oe
@@ -122,6 +122,8 @@ do_install () {
             echo "mkdir -p /var/$d" >> ${D}/etc/init.d/populate-var
             echo "chmod $mode /var/$d" >> ${D}/etc/init.d/populate-var
         done
+        echo "mkdir -p /var/lock/subsys" >> ${D}/etc/init.d/populate-var
+        echo "chmod 755 /var/lock/subsys" >> ${D}/etc/init.d/populate-var
         rmdir ${D}/var/*
         chmod a+x ${D}/etc/init.d/populate-var
         ln -s ../init.d/populate-var ${D}/etc/rcS.d/S37populate-var

diff --git a/dropbear/dropbear_0.41.oe b/dropbear/dropbear_0.41.oe
index 2af7555..fad6f34 100644 (file)
--- a/dropbear/dropbear_0.41.oe
+++ b/dropbear/dropbear_0.41.oe
@@ -22,13 +22,12 @@ do_install_prepend () {
 }
 pkg_postinst_append () {
 
-if [ "x$D" = "x" ]; then
-       if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
-               dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
-       fi
-       if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
-               dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
-       fi
+if [ -n "$D"  ]; then exit 1; fi
+if [ ! -f "${sysconfdir}/dropbear/dropbear_rsa_host_key" ]; then
+       dropbearkey -t rsa -f ${sysconfdir}/dropbear/dropbear_rsa_host_key
+fi
+if [ ! -f "${sysconfdir}/dropbear/dropbear_dss_host_key" ]; then
+       dropbearkey -t dss -f ${sysconfdir}/dropbear/dropbear_dss_host_key
 fi
 }
 

diff --git a/hotplug/hotplug_20040329.oe b/hotplug/hotplug_20040329.oe
index d753bdd..f4d6745 100644 (file)
--- a/hotplug/hotplug_20040329.oe
+++ b/hotplug/hotplug_20040329.oe
@@ -7,6 +7,11 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/hotplug-2004_03_2
            file://logcheck-ignore"
 S = "${WORKDIR}/hotplug-2004_03_29"
 
+INITSCRIPT_NAME = "hotplug"
+INITSCRIPT_PARAMS = "start 40 S . stop 89 0 6 ."
+
+inherit update-rc.d
+
 do_compile () {
        :
 }