浏览代码

Enabling and disabling wifi

Bob Mottram 8 年前
父节点
当前提交
7d232bc866
共有 2 个文件被更改,包括 9 次插入2 次删除
  1. 9
    1
      src/freedombone-utils-wifi
  2. 0
    1
      src/freedombone-wifi

+ 9
- 1
src/freedombone-utils-wifi 查看文件

@@ -315,6 +315,13 @@ function wifi_store_original_network_settings {
315 315
     fi
316 316
 }
317 317
 
318
+function wifi_original_network_settings {
319
+    remove_config_param "NETWORK_IS_STATIC"
320
+    if [ -f /etc/network/interfaces_original ]; then
321
+        cp /etc/network/interfaces_original /etc/network/interfaces
322
+    fi
323
+}
324
+
318 325
 function wifi_wpa2_psk {
319 326
     ssid=$1
320 327
     passphrase=$2
@@ -539,9 +546,10 @@ function disable_wifi {
539 546
         echo '# interfaces(5) file used by ifup(8) and ifdown(8)' > /etc/network/interfaces
540 547
         echo '# Include files from /etc/network/interfaces.d:' >> /etc/network/interfaces
541 548
         echo 'source-directory /etc/network/interfaces.d' >> /etc/network/interfaces
542
-        systemctl restart network-manager
549
+        remove_config_param "WIFI_INTERFACE"
543 550
         wpa_action ${WIFI_INTERFACE} stop
544 551
         wpa_cli -i ${WIFI_INTERFACE} terminate
552
+        systemctl restart network-manager
545 553
     else
546 554
         networks_from_file
547 555
     fi

+ 0
- 1
src/freedombone-wifi 查看文件

@@ -156,7 +156,6 @@ fi
156 156
 
157 157
 if [ ${WIFI_DISABLE} ]; then
158 158
     disable_wifi ${WIFI_DISABLE}
159
-    remove_config_param "WIFI_INTERFACE"
160 159
     exit 0
161 160
 fi
162 161