Browse Source

Detecting systemctl

Bob Mottram 9 years ago
parent
commit
4cbb4f74d7
1 changed files with 21 additions and 12 deletions
  1. 21
    12
      src/freedombone-client

+ 21
- 12
src/freedombone-client View File

@@ -101,19 +101,19 @@ function mesh_babel {
101 101
   echo '    echo "Interface $IFACE was not found"' >> $babel_script
102 102
   echo '    ifconfig $IFACE down' >> $babel_script
103 103
   echo '    pkill babeld' >> $babel_script
104
-  echo '    if [ -f /etc/init.d/networking ]; then' >> $babel_script
105
-  echo '        service networking restart' >> $babel_script
106
-  echo '    else' >> $babel_script
107
-  echo '        systemctl restart networking' >> $babel_script
108
-  echo '    fi' >> $babel_script
104
+  echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
105
+  echo '        systemctl restart networking' >> $batman_script
106
+  echo '    else' >> $batman_script
107
+  echo '        service networking restart' >> $batman_script
108
+  echo '    fi' >> $batman_script
109 109
   echo '    exit 1' >> $babel_script
110 110
   echo 'fi' >> $babel_script
111 111
   echo '' >> $babel_script
112
-  echo 'if [ -f /etc/init.d/networking ]; then' >> $babel_script
113
-  echo '    service networking stop' >> $babel_script
114
-  echo 'else' >> $babel_script
115
-  echo '    systemctl stop networking' >> $babel_script
116
-  echo 'fi' >> $babel_script
112
+  echo 'if [ -f /bin/systemctl ]; then' >> $batman_script
113
+  echo '    systemctl stop networking' >> $batman_script
114
+  echo 'else' >> $batman_script
115
+  echo '    service networking stop' >> $batman_script
116
+  echo 'fi' >> $batman_script
117 117
   echo 'ifconfig $IFACE down' >> $babel_script
118 118
   echo -n 'iwconfig $IFACE mode ad-hoc channel ' >> $babel_script
119 119
   echo "$WIFI_CHANNEL essid \"$ESSID\"" >> $babel_script
@@ -159,7 +159,12 @@ function mesh_batman {
159 159
   echo '        return' >> $batman_script
160 160
   echo '    fi' >> $batman_script
161 161
   echo '    echo "info: enabling batman-adv mesh network $ESSID on $IFACE"' >> $batman_script
162
-  echo '    systemctl stop networking' >> $batman_script
162
+
163
+  echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
164
+  echo '        systemctl stop networking' >> $batman_script
165
+  echo '    else' >> $batman_script
166
+  echo '        service networking stop' >> $batman_script
167
+  echo '    fi' >> $batman_script
163 168
   echo '    sleep 5' >> $batman_script
164 169
   echo '' >> $batman_script
165 170
   echo '    # Might have to re-enable wifi' >> $batman_script
@@ -218,7 +223,11 @@ function mesh_batman {
218 223
   echo '    ifconfig $IFACE down' >> $batman_script
219 224
   echo '    iwconfig $IFACE mode managed' >> $batman_script
220 225
   echo '' >> $batman_script
221
-  echo '    systemctl restart networking' >> $batman_script
226
+  echo '    if [ -f /bin/systemctl ]; then' >> $batman_script
227
+  echo '        systemctl restart networking' >> $batman_script
228
+  echo '    else' >> $batman_script
229
+  echo '        service networking restart' >> $batman_script
230
+  echo '    fi' >> $batman_script
222 231
   echo '}' >> $batman_script
223 232
   echo '' >> $batman_script
224 233
   echo 'if [ ! $IFACE_EXISTS ]; then' >> $batman_script