Kaynağa Gözat

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

Frédéric Pierret (fepitre) 4 yıl önce
ebeveyn
işleme
967060eb32
1 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 3 3
      init/functions

+ 3 - 3
init/functions

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