Compare commits

..

No commits in common. "0dd55997cbe3434505d0cd9e82240efab43b7884" and "0b5ffef8fe51b25f19009c4fc92d415f7f2bfa88" have entirely different histories.

5 changed files with 17 additions and 33 deletions

View File

@ -619,26 +619,24 @@
"Value": 0 "Value": 0
}, },
"geo.provider.network.url": { "geo.provider.network.url": {
"Comment": "See geoclue below.",
"Comment_beacondb": "Firefox only sends connected AP that won't work due to _nomap and the server side requires more than one as well. beacondb/beacondb#8", "Comment_beacondb": "Firefox only sends connected AP that won't work due to _nomap and the server side requires more than one as well. beacondb/beacondb#8",
"Comment_positon": "https://github.com/microg/GmsCore/issues/2237#issuecomment-2169193229", "Comment_positon": "https://github.com/microg/GmsCore/issues/2237#issuecomment-2169193229",
"Status": "locked", "Status": "clear",
"Type": "string", "Type": "string",
"Value": "", "Value": "https://beacondb.net/v1/geolocate",
"Value_beacondb": "https://beacondb.net/v1/geolocate",
"Value_positon": "https://api.positon.xyz/?key=74600654-2aec-11ef-aa95-3b7218da6865" "Value_positon": "https://api.positon.xyz/?key=74600654-2aec-11ef-aa95-3b7218da6865"
}, },
"geo.provider.use_geoclue": { "geo.provider.use_geoclue": {
"Comment": "/etc/geolocation, gpsd and global WPS configuration.", "Comment": "Helpful especially with /etc/geolocation",
"Status": "locked", "Status": "default",
"Type": "boolean", "Type": "boolean",
"Value": true "Value": true
}, },
"geo.provider.use_gpsd": { "geo.provider.use_gpsd": {
"Comment": "My geoclue should be using gpsd already.", "Comment": "I am trying to see if gpsd will speak to other apps too.",
"Status": "locked", "Status": "default",
"Type": "boolean", "Type": "boolean",
"Value": false "Value": true
}, },
"image.animation.mode": { "image.animation.mode": {
"Comment": "Preference not allowed for stability reasons. :(", "Comment": "Preference not allowed for stability reasons. :(",

View File

@ -1,4 +1,4 @@
[network-nmea] [network-nmea]
enable=true enable=true
# Refer to ../../systemd/system/geoclue.service.d/gpsd-socket.conf # Refer to ../../systemd/system/gpsd.service.d/aminda-additions.conf
nmea-socket=/tmp/gps-share.sock nmea-socket=/var/run/gps-share.sock

View File

@ -1,21 +0,0 @@
# systemd drop-in for ensuring geoclue has a socket to get GPS location from
# Weak dependency of geoclue pulling gpsd on so gpspipe might work?
[Unit]
Wants=gpsd.service gpsd.socket
# NOTE: /tmp is not /tmp, because the unit has systemd PrivateTmp. And
# SELINUX dislikes this, so
# ausearch -c 'geoclue' --raw | audit2allow -M my-geoclue
# semodule -X 300 -i my-geoclue.pp
[Service]
# Handle failure situation of the socket not going away (ExecStartPost=)
ExecStartPre=-/tmp/gps-share.sock
# Creating a socket for geoclue to connect to
# Credit: @schnell at https://gitlab.freedesktop.org/geoclue/geoclue/-/issues/145#note_1772702
ExecStartPost=/bin/sh -c "(gpspipe --nmea | ( read; read; read; cat ) | ncat --verbose --keep-open --listen --unixsock /tmp/gps-share.sock&)"
# In case of clean shutdown, remove the socket for restart
ExecStopPost=-/usr/bin/rm -vf /tmp/gps-share.sock
# vim: filetype=systemd

View File

@ -6,10 +6,17 @@ Type=exec
EnvironmentFile=-/etc/gpsd.aminda.conf EnvironmentFile=-/etc/gpsd.aminda.conf
# Kernel module possibly required for USB GPS devices especially with Chrony? # Kernel module possibly required for USB GPS devices especially with Chrony?
ExecStartPre=-/usr/sbin/modprobe pps_ldisc ExecStartPre=-/usr/sbin/modprobe pps_ldisc
# Handle failure situation of the socket not going away (ExecStartPost=)
ExecStartPre=-/usr/bin/rm -vf /var/run/gps-share.sock
# Empty ExecStart= before the actual ExecStart= removes the original # Empty ExecStart= before the actual ExecStart= removes the original
# ExecStart= line # ExecStart= line
ExecStart= ExecStart=
ExecStart=/usr/sbin/gpsd /dev/gps0 --nowait --foreground $AMINDAGPSD ExecStart=/usr/sbin/gpsd /dev/gps0 --nowait --foreground $AMINDAGPSD
# Creating a socket for geoclue to connect to
# Credit: @schnell at https://gitlab.freedesktop.org/geoclue/geoclue/-/issues/145#note_1772702
ExecStartPost=/bin/sh -c "(sleep 5 && gpspipe --nmea | ( read; read; read; cat ) | ncat --verbose --keep-open --listen --unixsock /var/run/gps-share.sock&)"
# In case of clean shutdown, remove the socket for restart
ExecStopPost=-/usr/bin/rm -vf /var/run/gps-share.sock
# Missing from the original unit, will reconnect all GPS says man gpsd # Missing from the original unit, will reconnect all GPS says man gpsd
ExecReload=/usr/bin/killall -HUP gpsd ExecReload=/usr/bin/killall -HUP gpsd
# Avoiding systemd considering the unit as failed. # Avoiding systemd considering the unit as failed.

View File

@ -23,7 +23,7 @@ set number " Show line numbers.
set ruler " Show the line and column number of the cursor position, set ruler " Show the line and column number of the cursor position,
" separated by a comma. " separated by a comma.
"set background=dark set background=dark
"Use modelines! "Use modelines!
set modeline set modeline