diff --git a/recipes-core/images/core-image-recovery.bb b/recipes-core/images/core-image-recovery.bb index 398453b..3a3fe9e 100644 --- a/recipes-core/images/core-image-recovery.bb +++ b/recipes-core/images/core-image-recovery.bb @@ -29,8 +29,4 @@ IMAGE_PREPROCESS_COMMAND += "image_patch;" image_patch () { # delete unused image rm -rf ${IMAGE_ROOTFS}/boot/* - # setup hostname -cat << 'EOF' >> "${IMAGE_ROOTFS}/etc/hostname" -diyaid -EOF } \ No newline at end of file diff --git a/recipes-diya/initramfs/files/init b/recipes-diya/initramfs/files/init index 5a4d0ab..f60a8c3 100755 --- a/recipes-diya/initramfs/files/init +++ b/recipes-diya/initramfs/files/init @@ -120,6 +120,8 @@ else fi fi +exec /sbin/init + # active the back light echo 0 > /sys/class/backlight/backlight/bl_power @@ -159,7 +161,7 @@ for m in $MODULES_DIR/*; do done done -exec /sbin/init + # exec sh # Catch all fatal "ERROR: Initramfs failed to initialize the system." diff --git a/recipes-diya/initramfs/recovery-boot_0.1.bb b/recipes-diya/initramfs/recovery-boot_0.1.bb index e585e97..80eea59 100644 --- a/recipes-diya/initramfs/recovery-boot_0.1.bb +++ b/recipes-diya/initramfs/recovery-boot_0.1.bb @@ -8,13 +8,10 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files:" PR = "r4" -inherit useradd - -inherit allarch +inherit allarch useradd update-rc.d SRC_URI = "file://init \ - file://udev \ - file://debug \ + file://confd \ " S = "${WORKDIR}" @@ -24,6 +21,9 @@ GROUPADD_PACKAGES = "${PN}" USERADD_PARAM:${PN} = "-u 0 -d /root -r -s /bin/sh root" +INITSCRIPT_NAME = "confd" +INITSCRIPT_PARAMS = "start 30 S ." + do_install() { install -d ${D}/init.d @@ -31,11 +31,12 @@ do_install() { install -m 0755 ${WORKDIR}/init ${D}/init # udev - install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev + # install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev # debug - install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug + # install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug + install -m 0755 ${WORKDIR}/confd ${D}/init.d/confd # Create device nodes expected by some kernels in initramfs # before even executing /init.