diff --git a/recipes-diya/initramfs/files/e2fs b/recipes-diya/initramfs/files/e2fs deleted file mode 100755 index 29f801a..0000000 --- a/recipes-diya/initramfs/files/e2fs +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Copyright (C) 2011 O.S. Systems Software LTDA. -# Licensed on MIT - -e2fs_enabled() { - return 0 -} - -e2fs_run() { - filesystems="ext4 ext3 ext2" - - # load modules - for fs in $filesystems; do - load_kernel_module $fs - done - - for fs in $filesystems; do - eval "fs_options=\$bootparam_${fs}" - if [ -n "$fs_options" ]; then - dev=`expr "$fs_options" : '\([^:]*\).*'` - path=`expr "$fs_options" : '[^:]*:\([^:]*\).*'` - - info "Mounting $dev as $fs on $path as $fs..." - mkdir -p $path - mount -t $fs $dev $path - fi - done -} diff --git a/recipes-diya/initramfs/files/exec b/recipes-diya/initramfs/files/exec deleted file mode 100644 index b2ed276..0000000 --- a/recipes-diya/initramfs/files/exec +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/sh -# Copyright (C) 2017 O.S. Systems Software LTDA. -# Licensed on MIT - -EXEC_DIR=/exec.d # place to look for modules - -exec_enabled() { - return 0 -} - -exec_run() { - if [ ! -d $EXEC_DIR ]; then - msg "No contents to exec in $EXEC_DIR. skipping ..." - fi - - # Load and run modules - for m in $EXEC_DIR/*; do - # Skip backup files - if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then - continue - fi - - debug "Starting $m" - - # process module - ./$m - done -} diff --git a/recipes-diya/initramfs/files/init b/recipes-diya/initramfs/files/init index 0f2a784..793ed51 100755 --- a/recipes-diya/initramfs/files/init +++ b/recipes-diya/initramfs/files/init @@ -159,7 +159,7 @@ for m in $MODULES_DIR/*; do done done -exec /sbin/init - +# 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 2160f68..ea03379 100644 --- a/recipes-diya/initramfs/recovery-boot_0.1.bb +++ b/recipes-diya/initramfs/recovery-boot_0.1.bb @@ -11,9 +11,7 @@ PR = "r4" inherit allarch SRC_URI = "file://init \ - file://exec \ file://udev \ - file://e2fs \ file://debug \ " @@ -25,15 +23,9 @@ do_install() { # base install -m 0755 ${WORKDIR}/init ${D}/init - # exec - install -m 0755 ${WORKDIR}/exec ${D}/init.d/89-exec - # udev install -m 0755 ${WORKDIR}/udev ${D}/init.d/01-udev - # e2fs - # install -m 0755 ${WORKDIR}/e2fs ${D}/init.d/10-e2fs - # debug install -m 0755 ${WORKDIR}/debug ${D}/init.d/00-debug