pyrox.dev
1diff --git a/fanctl b/fanctl
2index 4338b75..84cf987 100755
3--- a/fanctl
4+++ b/fanctl
5@@ -5,6 +5,8 @@
6 # fanctl down 15 10.1.0.1
7 #
8
9+export PATH="@PATH@"
10+
11 usage()
12 {
13 echo "Usage: $0 <cmd> [<options>...]" 1>&2
14@@ -23,8 +25,8 @@ run()
15 "$@"
16 }
17
18-state_dir="/run/ubuntu-fan"
19-lconfig_dir="/var/lib/ubuntu-fan/config"
20+state_dir="/run/fan-networking"
21+lconfig_dir="/var/lib/fan-networking/config"
22
23 __ip_split()
24 {
25@@ -931,12 +933,12 @@ dhcp_reconfigure()
26 --strict-order \
27 --bind-interfaces \
28 --pid-file="$state_dir/dnsmasq-$C_bridge_state.pid" \
29- --conf-file= \
30+ --conf-file=/dev/null \
31 $dhcp_flags \
32 --dhcp-no-override \
33 --except-interface=lo \
34 --interface="$C_bridge" \
35- --dhcp-leasefile=/var/lib/misc/dnsmasq."$C_bridge_state".leases \
36+ --dhcp-leasefile=/var/lib/fan-networking/dnsmasq."$C_bridge_state".leases \
37 --dhcp-authoritative \
38 || $fail "$C_bridge: failed to start dnsmasq"
39
40@@ -1559,21 +1561,23 @@ cmd_config()
41
42 case "$cmd" in
43 list|ls)
44- ls -1 "$lconfig_dir" | \
45- while read config
46- do
47- case "$config" in
48- *.conf) ;;
49- *) continue ;;
50- esac
51+ if [ -d $lconfig_dir ]; then
52+ ls -1 "$lconfig_dir" | \
53+ while read config
54+ do
55+ case "$config" in
56+ *.conf) ;;
57+ *) continue ;;
58+ esac
59
60- config=$( echo "$config" | sed \
61- -e 's/.conf$//' \
62- -e 's/--/ /g' \
63- -e 's@-@/@g'
64- )
65- echo "$config"
66- done
67+ config=$( echo "$config" | sed \
68+ -e 's/.conf$//' \
69+ -e 's/--/ /g' \
70+ -e 's@-@/@g'
71+ )
72+ echo "$config"
73+ done
74+ fi
75 ;;
76 show)
77 cmd_decode_init
78@@ -1588,6 +1592,7 @@ cmd_config()
79 [ -f "$uconfig" ] && cat "$uconfig"
80 ;;
81 set)
82+ mkdir -p $lconfig_dir || fail "could not create config directory ($lconfig_dir)"
83 cmd_decode_init
84 if ! cmd_decode_config "config set" "$@"; then
85 fail "invalid config"