Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix invalid rule warning at startup #9

Open
wants to merge 1 commit into
base: webOS-ports/webOS-OSE
Choose a base branch
from
+18 −12
Open

Fix invalid rule warning at startup #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion files/conf/90-storaged.rules.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
# LICENSE@@@


KERNEL=="usb_gadget", SUBSYSTEM=="platform", DRIVER=="usb_gadget", ENV{G_SUBSYSTEM}=="storage", ACTION=="change", RUN+="@WEBOS_INSTALL_SYSCONFDIR@/udev/scripts/storage.sh $ENV{G_ACTION} $ENV{G_MEDIA_LOADED}$ENV{G_HOST_CONNECTED}$ENV{G_MEDIA_REQUESTED}$ENV{G_BUS_SUSPENDED}"
ericblade marked this conversation as resolved.
Show resolved Hide resolved
KERNEL=="usb_gadget", SUBSYSTEM=="platform", DRIVER=="usb_gadget", ENV{G_SUBSYSTEM}=="storage", ACTION=="change", RUN+="/bin/sh -c '/etc/udev/scripts/storage.sh $env{G_ACTION} $env{G_MEDIA_LOADED} $env{G_HOST_CONNECTED} $env{G_MEDIA_REQUESTED} $env{G_BUS_SUSPENDED}'"
SUBSYSTEM=="android_usb", ACTION=="change", ATTR{state}=="CONFIGURED", RUN+="@WEBOS_INSTALL_SYSCONFDIR@/udev/scripts/storage.sh HOST_STATE_CHANGED 1"
SUBSYSTEM=="android_usb", ACTION=="change", ATTR{state}=="DISCONNECTED", RUN+="@WEBOS_INSTALL_SYSCONFDIR@/udev/scripts/storage.sh HOST_STATE_CHANGED 0"

28 changes: 17 additions & 11 deletions scripts/public/storage.sh.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,34 +27,40 @@ ErrPrint() {
logger -t udev_storaged -p err "$@"
}

DbgPrint "$0($1,$2) called: "
DbgPrint "$0($1,$2,$3,$4,$5) called: "

action="$1"
change="$2"
ACTION="$1"
MEDIA_LOADED="$2"
HOST_CONNECTED="$3"
MEDIA_REQUESTED="$4"
BUS_SUSPENDED="$5"
CHANGE="${MEDIA_LOADED}${HOST_CONNECTED}${MEDIA_REQUESTED}${BUS_SUSPENDED}"

if [ "$action" == "HOST_STATE_CHANGED" ]; then
if [ "$ACTION" == "HOST_STATE_CHANGED" ]; then
method="changed"
change_name="connected"
elif [ "$action" == "MEDIA_STATE_CHANGED" ]; then
elif [ "$ACTION" == "MEDIA_STATE_CHANGED" ]; then
method="avail"
change_name="connected"
elif [ "$action" == "MEDIA_REQUEST_STATE_CHANGED" ]; then
elif [ "$ACTION" == "MEDIA_REQUEST_STATE_CHANGED" ]; then
method="requestMedia"
change_name="connected"
elif [ "$action" == "BUS_STATE_CHANGED" ]; then
elif [ "$ACTION" == "BUS_STATE_CHANGED" ]; then
method="busSuspended"
change_name="suspended"
else
ErrPrint "unknown action $action passed to $0"
ErrPrint "unknown action $ACTION passed to $0"
return
fi

if [ "$change" == "0" ]; then
# TODO: If more than one of the change variables is set, this script will not know how to deal with it. It never has known, though.
# Probably need to check with a Legacy webOS device, to see how it handled this situation, and model something after that.
if [ "$CHANGE" == "0" ]; then
MESSAGE="{\"$change_name\": false}"
elif [ "$change" == "1" ]; then
elif [ "$CHANGE" == "1" ]; then
MESSAGE="{\"$change_name\": true}"
else
ErrPrint "unexpected change $change passed to $0"
ErrPrint "unexpected change $CHANGE passed to $0"
return
fi

Expand Down