Qubes/core-agent-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

init/functions: handle non-present /qubes-mac qubesdb and check if iface exists

Browse Source
This commit is contained in:
Frédéric Pierret (fepitre) 2019-06-20 16:06:25 +02:00
parent aa7ab25a78
commit 967060eb32
No known key found for this signature in database
GPG Key ID: 484010B5CDC576E2
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
init/functions
View File

@ -131,7 +131,7 @@ umount_retry() {
get_mac_from_iface() { get_mac_from_iface() {
local iface="$1" local iface="$1"
local mac local mac
if [ "x$iface" != "x" ]; then if [ "x$iface" != "x" ] && [ -e "/sys/class/net/$iface" ]; then
mac="$(cat "/sys/class/net/$iface/address")" mac="$(cat "/sys/class/net/$iface/address")"
fi fi
echo "$mac" echo "$mac"
@ -149,7 +149,7 @@ get_iface_from_mac() {
get_qubes_managed_iface() { get_qubes_managed_iface() {
local mac local mac
local qubes_iface local qubes_iface
mac="$(qubesdb-read /qubes-mac)" mac="$(qubesdb-read /qubes-mac 2> /dev/null)"
qubes_iface="$(get_iface_from_mac "$mac")" qubes_iface="$(get_iface_from_mac "$mac")"
if [ "x$qubes_iface" != "x" ]; then if [ "x$qubes_iface" != "x" ]; then
echo "$qubes_iface" echo "$qubes_iface"