Compare commits

...

8 Commits

Author SHA1 Message Date
Sukru Senli
b858cfe11c iop: genconfig: remove build_dir not found warning 2017-07-12 10:19:41 +02:00
Kenneth Johansson
eea8aa3773 genconfig: ignore missing files.
Do not print out error if the files do not exist.
2017-07-12 10:19:32 +02:00
Sukru Senli
37fd39f8ac iop: genconfig: do not attempt to clone if no access to customerconfigs 2017-07-11 18:12:51 +02:00
Sukru Senli
973fd39a80 inteno-netmodes: bring uplink wifi interface up/down if broadcom 2017-07-05 15:05:05 +02:00
Sukru Senli
99fef6e08c inteno-netmodes: reload questd network after changing mode 2017-07-04 13:49:19 +02:00
Sukru Senli
f5b8434da9 ice-client: set passwords via uci 2017-07-04 13:40:15 +02:00
Reidar Cederqvist
e31148f63a inteno-netmode: netmode-conf: fixed bug if mode is default empty 2017-07-03 09:41:50 +02:00
Sukru Senli
7e9f205d60 icwmp-3.0-2017-06-30 2017-07-03 09:41:35 +02:00
5 changed files with 24 additions and 15 deletions

View File

@@ -1,11 +1,12 @@
#!/bin/sh
grep -rq "^ice:" /etc/passwd || {
local password="$(db get hw.board.wpaKey)"
if [ -n "$password" ]; then
adduser -D -H -s /bin/false ice
(echo $password; sleep 1; echo $password) | passwd ice >/dev/null 2>&1
fi
adduser -D -H -s /bin/false ice
uci -q delete passwords.ice
uci -q set passwords.ice=usertype
uci -q set passwords.ice.password="\$WPAKEY"
uci -q add_list passwords.ice._access_r=root
uci -q commit passwords
}
uci show rpcd | grep username=.*ice.* >/dev/null || {
@@ -47,6 +48,7 @@ config login
list write 'juci-network-netifd'
list write 'juci-owsd'
list write 'juci-printer'
list write 'juci-realtime-graphs'
list write 'juci-samba'
list write 'juci-sfp'
list write 'juci-snmpd'
@@ -56,6 +58,7 @@ config login
list write 'juci-usb'
list write 'core'
list write 'unauthenticated'
EOF
}

View File

@@ -8,11 +8,11 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=icwmp
PKG_VERSION:=3.0-2017-06-22
PKG_VERSION:=3.0-2017-06-30
PKG_FIXUP:=autoreconf
PKG_SOURCE_URL:=http://public.inteno.se:/icwmp.git
PKG_SOURCE_PROTO:=git
PKG_SOURCE_VERSION:=f97e84be706fcf066927a16aa9094aa5f3c7807c
PKG_SOURCE_VERSION:=0999d69acc7e02b8f6ffcc1c4ca4c759de0f7915
PKG_RELEASE=$(PKG_SOURCE_VERSION)
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

View File

@@ -67,7 +67,9 @@ case "$ACTION" in
uci set network.wan.ifname="$(echo $WANDEV $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$wetif //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
uci commit network
ubus call network reload
[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss down 2>/dev/null
ping -c 1 -w 10 $defroute >/dev/null 2>&1 || killall -USR1 udhcpc
ubus call router.network reload
ubus call leds set '{"state" : "normal"}'
;;
remove|unregister)
@@ -87,11 +89,13 @@ case "$ACTION" in
uci set network.wan.ifname="$(echo $wetif $(uci get network.wan.ifname) | sed 's/$/ /' | sed -r "s/$WANDEV //g" | tr ' ' '\n' | sort -u | tr '\n' ' ')"
uci commit network
ubus call network reload
[ -f /usr/sbin/wlctl ] && wlctl -i $wetif bss up 2>/dev/null
ping -c 1 -w 10 $defroute >/dev/null 2>&1 || {
killall -9 wifi
wifi reload nodat
killall -USR1 udhcpc
}
ubus call router.network reload
ubus call leds set '{"state" : "normal"}'
;;
esac

View File

@@ -63,7 +63,7 @@ get_iface_num() {
break
fi
mode="$(uci -q get wireless.@wifi-iface[$i].mode)"
if [ "$mode" != "ap" ]; then
if [ "$mode" == "wet" -o "$mode" == "sta" ]; then
i=$((i+1))
continue
fi

View File

@@ -155,15 +155,17 @@ function genconfig {
setup_dirs()
{
if [ $DEVELOPER -eq 1 ]; then
if ssh -o ConnectTimeout=5 git@private.inteno.se 2>/dev/null | grep -qw ${CUSTREPO:22}; then
if [ ! -d "$CUSTPATH" ]; then
git clone "$CUSTREPO" "$CUSTPATH" || exit
git clone "$CUSTREPO" "$CUSTPATH"
elif [ $IMPORT -eq 1 ]; then
cd $CUSTPATH
v "git pull"
git pull
cd - >/dev/null #go back
cd $CUSTPATH
v "git pull"
git pull
cd - >/dev/null #go back
fi
else
echo "You do not have access to $CUSTREPO"
fi
if [ ! -d "$FILEDIR" ]; then
@@ -294,7 +296,7 @@ function genconfig {
# we need to signal to bradcom SDK that we have changed the board id
# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
# so just touch that file.
find build_dir/ -name "boardparms*c" -print0 | xargs -0 touch
[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
# Set default values based on selected parameters
v "$(make defconfig 2>&1)"