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

Jump to bottom

Remove statefs use #85

Merged
merged 1 commit into from Mar 31, 2020
Merged

Remove statefs use #85

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions rpm/sp-rich-core.spec
View file
Open in desktop
Expand Up @@ -21,6 +21,9 @@ Requires: ssu-sysinfo
Requires: findutils
# awk used by scripts/rich-core-dumper
Requires: gawk
# dbus, connman used by scripts/rich-core-dumper
Requires: dbus
Requires: connman
# getent used by scripts/rich-core-dumper
Requires: glibc-common

Expand Down
22 changes: 15 additions & 7 deletions scripts/rich-core-dumper
View file
Open in desktop
Expand Up @@ -214,7 +214,7 @@ _section_ifconfig()

_section_df()
{
_print_command_with_header /bin/df -x fuse.statefs
_print_command_with_header /bin/df
}

_section_ls_proc()
Expand Down Expand Up @@ -600,16 +600,24 @@ if ! _check_core_location; then
exit
fi

if [ "$core_name" != "statefs" ]; then
network_type=$(cat /run/state/namespaces/Internet/NetworkType)
fi
network_type=$(dbus-send --system --type=method_call --print-reply --dest=net.connman / net.connman.Manager.GetTechnologies | awk '
BEGIN { connected = ""; }
/object path/ { t = 0; c = 0; type=""; next; }
/string "Type"$/ { t = 1; next; }
/string "Connected"$/ { c = 1; next; }
t == 1 && /string/ { type = gensub(/^.*string "(.*)".*$/,"\\1", "g"); t = 0; next; }
c == 1 && /boolean/ { c = gensub(/^.*boolean (.*)$/,"\\1", "g") == "true" ? 2 : 0; next; }
c == 2 && type != "" { connected = type; type = ""; c = 0; }
END { print(connected) }
')

has_suitable_network_connection=false

# Don't download anything when on a network that charges for data.
# Valid NetworkType values are from src/connman/provider_connman.cpp in
# Nemo Mobile's statefs-providers.
if [ x"$network_type" = x"WLAN" -o x"$network_type" = x"ethernet" ]; then
# Valid NetworkType values are from connman/plugins/*.c files defined as .name
# values in the connman_technology_driver structs. The following will list them.
# grep "struct connman_technology_driver" connman/plugins/* -A1 | grep -o "\".*\""
if [ x"$network_type" = x"wifi" -o x"$network_type" = x"ethernet" ]; then
has_suitable_network_connection=true
fi

Expand Down