merge of 92eb0d6f08f5ac3bdb8b69280bd69145bd2b42ab

     and f4954b87346baa782592647d49aced9350906ce0

diff --cc packages/initscripts/initscripts_1.0.bb
index e7863ff,3fbbda4..8c735b7
--- 1/packages/initscripts/initscripts_1.0.bb
--- 2/packages/initscripts/initscripts_1.0.bb
+++ b/packages/initscripts/initscripts_1.0.bb
@@@ -6,7 -6,7 +6,7 @@@ DEPENDS = "makedevs
  DEPENDS_openzaurus = "makedevs virtual/kernel"
  RDEPENDS = "makedevs"
  LICENSE = "GPL"
- PR = "r49"
 -PR = "r48"
++PR = "r47"
  
  SRC_URI = "file://halt \
             file://ramdisk \
@@@ -30,11 -30,10 +30,8 @@@
             file://umountnfs.sh \
             file://sysfs.sh \
             file://device_table.txt \
--         file://populate-volatile.sh \
--         file://volatiles \
             file://corgikeymap-2.6.map \
-            file://tosakeymap-2.6.map \
-          file://akitakeymap.map"
+            file://tosakeymap-2.6.map"
  
  SRC_URI_append_arm = " file://alignment.sh"
  SRC_URI_append_openzaurus = " file://checkversion"
@@@ -86,8 -84,8 +82,6 @@@ do_install () 
        install -m 0755    ${WORKDIR}/devpts.sh ${D}${sysconfdir}/init.d
        install -m 0755    ${WORKDIR}/devpts            ${D}${sysconfdir}/default
        install -m 0755    ${WORKDIR}/sysfs.sh          ${D}${sysconfdir}/init.d
--      install -m 0755    ${WORKDIR}/populate-volatile.sh ${D}${sysconfdir}/init.d
--      install -m 0644    ${WORKDIR}/volatiles         ${D}${sysconfdir}/default
        if [ "${TARGET_ARCH}" = "arm" ]; then
                install -m 0755 ${WORKDIR}/alignment.sh ${D}${sysconfdir}/init.d
        fi
@@@ -152,7 -144,7 +140,6 @@@
        ln -sf          ../init.d/devices       ${D}${sysconfdir}/rcS.d/S05devices
        # udev will run at S04 if installed
        ln -sf          ../init.d/sysfs.sh      ${D}${sysconfdir}/rcS.d/S03sysfs
--      ln -sf          ../init.d/populate-volatile.sh  ${D}${sysconfdir}/rcS.d/S37populate-volatile.sh
        ln -sf          ../init.d/devpts.sh     ${D}${sysconfdir}/rcS.d/S38devpts.sh
        if [ "${TARGET_ARCH}" = "arm" ]; then
                ln -sf  ../init.d/alignment.sh  ${D}${sysconfdir}/rcS.d/S06alignment

diff --cc packages/linux/linux-openzaurus_2.6.12-mm1.bb
index fe94202,b8f64be..fc519ec
--- 1/packages/linux/linux-openzaurus_2.6.12-mm1.bb
--- 2/packages/linux/linux-openzaurus_2.6.12-mm1.bb
+++ b/packages/linux/linux-openzaurus_2.6.12-mm1.bb
@@@ -5,7 -5,7 +5,7 @@@ LICENSE = "GPL
  #KV = "${@bb.data.getVar('PV',d,True).split('-')[0]}"
  KV = "${@bb.data.getVar('PV',d,True)}"
  
- PR = "r5"
 -PR = "r6"
++PR = "r4"
  
  DOSRC = "http://www.do13.in-berlin.de/openzaurus/patches"
  RPSRC = "http://www.rpsys.net/openzaurus/patches"