mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-02-15 03:51:51 +00:00
Code Issues Releases Wiki Activity

Fix omr rename in some case

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2021-01-05 07:58:03 +01:00
parent c0f4def8ea
commit dd7a0481de
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
luci-app-openmptcprouter/root/etc/hotplug.d/net/99-omr-rename
View file

@ -27,14 +27,14 @@ _set_intf_name() {
if [ "$modalias" = "$chk_modalias" ] && [ "$INTERFACE" != "$ifname" ]; then if [ "$modalias" = "$chk_modalias" ] && [ "$INTERFACE" != "$ifname" ]; then
logger -t "OMR-Rename" "Rename ${INTERFACE} to ${ifname}" logger -t "OMR-Rename" "Rename ${INTERFACE} to ${ifname}"
existif=0 existif=0
ip link set ${INTERFACE} down ip link set ${INTERFACE} down 2>&1 >/dev/null
[ "$(ip link show ${ifname} 2>/dev/null)" != "" ] && { [ "$(ip link show ${ifname} 2>/dev/null)" != "" ] && {
ip link set ${ifname} name ${ifname}tmp ip link set ${ifname} name ${ifname}tmp 2>&1 >/dev/null
existif=1 existif=1
} }
ip link set ${INTERFACE} name ${ifname} ip link set ${INTERFACE} name ${ifname} 2>&1 >/dev/null
ip link set ${ifname} up ip link set ${ifname} up 2>&1 >/dev/null
[ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE} [ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE} 2>&1 >/dev/null
fi fi
fi fi
elif [ -f /dev/${DEVICE_NAME} ] && [ -n "$MODALIAS" ] && [ "$modalias" = "$MODALIAS" ]; then elif [ -f /dev/${DEVICE_NAME} ] && [ -n "$MODALIAS" ] && [ "$modalias" = "$MODALIAS" ]; then
@ -46,15 +46,15 @@ _set_intf_name() {
} }
[ -z "$modalias" ] && [ -n "$device" ] && [ -n "$ifname" ] && [ "/sys${DEVPATH}" = "$device" ] && [ "$INTERFACE" != "$ifname" ] && { [ -z "$modalias" ] && [ -n "$device" ] && [ -n "$ifname" ] && [ "/sys${DEVPATH}" = "$device" ] && [ "$INTERFACE" != "$ifname" ] && {
logger -t "OMR-Rename" "Rename ${INTERFACE} to ${ifname}" logger -t "OMR-Rename" "Rename ${INTERFACE} to ${ifname}"
ip link set ${INTERFACE} down ip link set ${INTERFACE} down 2>&1 >/dev/null
existif=0 existif=0
[ "$(ip link show ${ifname} 2>/dev/null)" != "" ] && { [ "$(ip link show ${ifname} 2>/dev/null)" != "" ] && {
ip link set ${ifname} name ${ifname}tmp ip link set ${ifname} name ${ifname}tmp 2>&1 >/dev/null
existif=1 existif=1
} }
ip link set ${INTERFACE} name ${ifname} ip link set ${INTERFACE} name ${ifname} 2>&1 >/dev/null
ip link set ${ifname} up ip link set ${ifname} up 2>&1 >/dev/null
[ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE} [ "$existif" = "1" ] && ip link set ${ifname}tmp ${$INTERFACE} 2>&1 >/dev/null
} }
} }