Add rootfs detection by path of /bin/sh #394
Conversation
Signed-off-by: Jens Lucius <git@jenslucius.de>
|
Fixes #391 |
helpers/helpers_emba_prepare.sh
Outdated
| if [[ -d "$R_PATH" ]]; then | ||
| ROOT_PATH+=( "$R_PATH" ) | ||
| if [[ -n "$MECHANISM" ]] && ! echo "$MECHANISM" | grep -q "file names"; then | ||
| MECHANISM="$MECHANISM / file names" |
There was a problem hiding this comment.
let's change this from file names to something like shells. Could you please also change this in bash detection?
I think we can improve this detection a bit if we are going to pimp the find command the following way:
find "$SEARCH_PATH" -xdev -path "*bin/sh" -exec file {} \; | grep "ELF" | cut -d: -f1 | sed -E 's/\/.?bin\/sh//'
Same for the bash block.
There was a problem hiding this comment.
I have added this, I also reversed the logic of settings the MECHANISM, still have to test if it works correctly. I also want to do more tests, because it feels odd that my filesystem was not detected as root filesystem when looking at the other checks.
- Reverse logic for setting the root dir detection method message - Add type "shell" for root dir detection Signed-off-by: Jens Lucius <git@jenslucius.de>
helpers/helpers_emba_prepare.sh
Outdated
| MECHANISM="$MECHANISM / file names" | ||
| elif ! echo "$MECHANISM" | grep -q "binary interpreter"; then | ||
| MECHANISM="file names" | ||
| if [[ -z "$MECHANISM" ]]; then |
helpers/helpers_emba_prepare.sh
Outdated
| if [[ -n "$MECHANISM" ]] && ! echo "$MECHANISM" | grep -q "dir names"; then | ||
| MECHANISM="$MECHANISM / dir names" | ||
| elif ! echo "$MECHANISM" | grep -q "binary interpreter"; then | ||
| if [[ -z "$MECHANISM" ]]; then |
There was a problem hiding this comment.
alignment issue? Which editor are you using? Please set it up to automatically use 2 spaces for a tab
helpers/helpers_emba_prepare.sh
Outdated
| elif [[ -n "$MECHANISM" ]] && ! echo "$MECHANISM" | grep -q "busybox"; then | ||
| MECHANISM="$MECHANISM / busybox" | ||
| fi | ||
| fi |
There was a problem hiding this comment.
Sorry, was some copy and paste issue and I have set my editor to 2 spaces now
|
Thanks for your improvements. Are you using check_project.sh ? The script will do a bunch of code checks |
Signed-off-by: Jens Lucius <git@jenslucius.de>
|
I have also checked why my rootfs was not detected, but the Interpreter path points to some random directory that does not exist in the extracted file system and there are only 4 directories detected for the directory search (/lib, /lib64 /etc /bin), so that missing the at least 5 part, so the code seems to run fine. |
Yes, it looks like the interpreter does not always works. This is the reason for the other checks. From our experience these checks are working quite good but there is room for improvements. Probably we could combine the detection mechanisms in the future a bit more. With this we would be able to also detect unusual systems. For now, thank you for your contribution. You made EMBA better :) |
Signed-off-by: Jens Lucius git@jenslucius.de
Fix detection of android root path
What is the current behavior? (You can also link to an open issue here)
Does not detect root path
What is the new behavior (if this is a feature change)? If possible add a screenshot.
Detect root path by looking for /bin/sh
No