mirror of
https://github.com/gtxaspec/wz_mini_hacks.git
synced 2025-12-02 05:58:15 +00:00
Merge branch 'gtxaspec:master' into master
This commit is contained in:
@@ -8,8 +8,10 @@ domain-needed
|
||||
bogus-priv
|
||||
dns-forward-max=150
|
||||
cache-size=1000
|
||||
min-cache-ttl=86400
|
||||
neg-ttl=3600
|
||||
no-poll
|
||||
resolv-file=/opt/wz_mini/etc/resolv.dnsmasq
|
||||
addn-hosts=/opt/wz_mini/etc/hosts
|
||||
#log-facility=-
|
||||
#log-queries
|
||||
|
||||
1
SD_ROOT/wz_mini/etc/hosts
Normal file
1
SD_ROOT/wz_mini/etc/hosts
Normal file
@@ -0,0 +1 @@
|
||||
127.0.0.1 localhost
|
||||
@@ -48,18 +48,62 @@ wait_wlan() {
|
||||
##Check if the driver has been loaded for the onboard wlan0, store the MAC.
|
||||
while true
|
||||
do
|
||||
if ifconfig wlan0 | grep "inet addr"; then
|
||||
if ifconfig wlan0 | grep "HWaddr"; then
|
||||
echo "wlan0 hwaddr is up"
|
||||
store_mac
|
||||
break
|
||||
elif ifconfig wlan0 | grep "inet addr" && [[ "$ENABLE_USB_ETH" == "true" || "$ENABLE_USB_DIRECT" == "true" ]]; then
|
||||
store_mac
|
||||
break
|
||||
fi
|
||||
echo " wlan0 not ready yet..."
|
||||
else
|
||||
echo "wlan0 hwaddr not ready yet..."
|
||||
sleep 5
|
||||
fi
|
||||
done
|
||||
}
|
||||
|
||||
wpa_check() {
|
||||
##Check if wpa_supplicant has been created by iCamera
|
||||
if [ -e /tmp/wpa_supplicant.conf ]; then
|
||||
wait_wlan
|
||||
echo "wpa_supplicant.conf ready"
|
||||
else
|
||||
echo "wpa_supplicant.conf not ready, wait some time for creation."
|
||||
COUNT=0
|
||||
ATTEMPTS=15
|
||||
until [[ -e /tmp/wpa_supplicant.conf ]] || [[ $COUNT -eq $ATTEMPTS ]]; do
|
||||
echo -e "$(( COUNT++ ))... \c"
|
||||
sleep 5
|
||||
wpa_check
|
||||
done
|
||||
if [[ $COUNT -eq $ATTEMPTS ]]; then
|
||||
echo "time exceeded waiting for iCamera, continue potentially broken condition without network."
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
wlanold_check() {
|
||||
#Have we renamed interfaces yet?
|
||||
if [ -d /sys/class/net/wlanold ]; then
|
||||
echo "wlanold exist"
|
||||
eth_wlan_up
|
||||
else
|
||||
echo "wlanold doesn't exist"
|
||||
if [[ "$BONDING_ENABLED" == "true" ]] && ([[ "$ENABLE_USB_ETH" == "true" ]] || [[ "$ENABLE_USB_DIRECT" == "true" ]]); then
|
||||
rename_interface_and_setup_bonding bond0 "$BONDING_PRIMARY_INTERFACE" "$BONDING_SECONDARY_INTERFACE"
|
||||
else
|
||||
rename_interface $1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
netloop() {
|
||||
##While loop for check
|
||||
while true
|
||||
do
|
||||
wlanold_check $1
|
||||
echo "wlan0 not ready yet..."
|
||||
sleep 5
|
||||
done
|
||||
}
|
||||
|
||||
rename_interface() {
|
||||
##Fool iCamera by renaming the hardline interface to wlan0
|
||||
echo "renaming interfaces"
|
||||
@@ -166,48 +210,6 @@ eth_wlan_up() {
|
||||
break
|
||||
}
|
||||
|
||||
wpa_check() {
|
||||
#Check if wpa_supplicant has been created by iCamera
|
||||
if [ -e /tmp/wpa_supplicant.conf ]; then
|
||||
echo "wpa_supplicant.conf ready"
|
||||
wlanold_check $1
|
||||
else
|
||||
echo "wpa_supplicant.conf not ready, wait some time for creation."
|
||||
COUNT=0
|
||||
ATTEMPTS=15
|
||||
until [[ -e /tmp/wpa_supplicant.conf ]] || [[ $COUNT -eq $ATTEMPTS ]]; do
|
||||
echo -e "$(( COUNT++ ))... \c"
|
||||
sleep 5
|
||||
done
|
||||
[[ $COUNT -eq $ATTEMPTS ]] && echo "time exceeded waiting for iCamera, continue potentially broken condition without network." && wlanold_check $1
|
||||
fi
|
||||
}
|
||||
|
||||
wlanold_check() {
|
||||
#Have we renamed interfaces yet?
|
||||
if [ -d /sys/class/net/wlanold ]; then
|
||||
echo "wlanold exist"
|
||||
eth_wlan_up
|
||||
else
|
||||
echo "wlanold doesn't exist"
|
||||
if [[ "$BONDING_ENABLED" == "true" ]] && ([[ "$ENABLE_USB_ETH" == "true" ]] || [[ "$ENABLE_USB_DIRECT" == "true" ]]); then
|
||||
rename_interface_and_setup_bonding bond0 "$BONDING_PRIMARY_INTERFACE" "$BONDING_SECONDARY_INTERFACE"
|
||||
else
|
||||
rename_interface $1
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
netloop() {
|
||||
##While loop for check
|
||||
while true
|
||||
do
|
||||
wpa_check $1
|
||||
echo "wlan0 not ready yet..."
|
||||
sleep 5
|
||||
done
|
||||
}
|
||||
|
||||
swap_enable() {
|
||||
if [ -e /opt/wz_mini/swap ]; then
|
||||
echo "Swap file exists"
|
||||
@@ -249,7 +251,7 @@ done
|
||||
}
|
||||
|
||||
first_run_check
|
||||
wait_wlan
|
||||
wpa_check
|
||||
|
||||
#Set module dir depending on platform
|
||||
if [ -f /opt/wz_mini/tmp/.T20 ]; then
|
||||
@@ -383,13 +385,8 @@ if [[ "$ENABLE_USB_DIRECT" == "true" ]]; then
|
||||
|
||||
swap_enable
|
||||
|
||||
#loop begin
|
||||
while true
|
||||
do
|
||||
wpa_check usb0
|
||||
echo "wlan0 not ready yet..."
|
||||
sleep 1
|
||||
done
|
||||
netloop usb0
|
||||
|
||||
else
|
||||
echo "USB Direct disabled"
|
||||
fi
|
||||
@@ -407,13 +404,8 @@ if [[ "$ENABLE_USB_RNDIS" == "true" ]]; then
|
||||
|
||||
swap_enable
|
||||
|
||||
#loop begin
|
||||
while true
|
||||
do
|
||||
wpa_check usb0
|
||||
echo "wlan0 not ready yet..."
|
||||
sleep 1
|
||||
done
|
||||
netloop usb0
|
||||
|
||||
fi
|
||||
else
|
||||
echo "usb rndis disabled"
|
||||
@@ -593,6 +585,16 @@ if [[ "$NIGHT_DROP_DISABLE" == "true" ]]; then
|
||||
touch /opt/wz_mini/tmp/.nd
|
||||
fi
|
||||
|
||||
if [[ "$ENABLE_LOCAL_DNS" == "true" ]]; then
|
||||
dnsmasq -C /opt/wz_mini/etc/dnsmasq.conf
|
||||
rm -f /tmp/resolv.conf
|
||||
cp /opt/wz_mini/etc/resolv.conf /tmp/resolv.conf
|
||||
fi
|
||||
|
||||
if [[ "$WEB_SERVER_ENABLED" == "true" ]]; then
|
||||
httpd -p 80 -h /opt/wz_mini/www
|
||||
fi
|
||||
|
||||
hostname_set
|
||||
touch /opt/wz_mini/tmp/.wz_user_firstrun
|
||||
pkill -f dumpload #Kill dumpload so it won't waste cpu or ram gathering cores and uploading them when something crashes
|
||||
|
||||
1
SD_ROOT/wz_mini/etc/passwd
Normal file
1
SD_ROOT/wz_mini/etc/passwd
Normal file
@@ -0,0 +1 @@
|
||||
root:x:0:0:root:/opt/wz_mini/root:/bin/sh
|
||||
1
SD_ROOT/wz_mini/etc/resolv.conf
Normal file
1
SD_ROOT/wz_mini/etc/resolv.conf
Normal file
@@ -0,0 +1 @@
|
||||
nameserver 127.0.0.1
|
||||
@@ -1,4 +1,4 @@
|
||||
#List your desired upstream dns servers here
|
||||
|
||||
#nameserver 8.8.8.8
|
||||
#nameserver 8.8.4.4
|
||||
nameserver 1.1.1.1
|
||||
nameserver 1.0.0.1
|
||||
|
||||
@@ -92,6 +92,7 @@ NIGHT_DROP_DISABLE="false"
|
||||
DISABLE_MOTOR="false"
|
||||
ENABLE_FSCK_ON_BOOT="false"
|
||||
ENABLE_CAR_DRIVER="false"
|
||||
ENABLE_LOCAL_DNS="false"
|
||||
|
||||
#####DEBUG#####
|
||||
#drops you to a shell via serial, doesn't load app_init.sh
|
||||
@@ -99,5 +100,8 @@ DEBUG_ENABLED="false"
|
||||
DEBUG_INITRAMFS_ENABLED="false"
|
||||
DEBUG_PASSWORD="false"
|
||||
|
||||
####WEB####
|
||||
WEB_SERVER_ENABLED="false"
|
||||
|
||||
#####SCRIPTING#####
|
||||
CUSTOM_SCRIPT_PATH=""
|
||||
|
||||
Reference in New Issue
Block a user