Changes since 2.8.2 as recorded in NEWS-2.8.2 - NSH implementation now conforms to latest draft (draft-ietf-sfc-nsh-28). - Bug fixes 0006-adapt-ovs-scripts.patch was splited into two separate patches as the original patch does not apply against 2.8.2 anymore. Other patches are just re-numbered without actual function change Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>lilik-openwrt-22.03
@ -1,30 +0,0 @@ | |||||
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in | |||||
index dc1d02c..61ecf2f 100755 | |||||
--- a/utilities/ovs-ctl.in | |||||
+++ b/utilities/ovs-ctl.in | |||||
@@ -108,7 +108,7 @@ set_system_ids () { | |||||
esac | |||||
set "$@" external-ids:system-id="\"$SYSTEM_ID\"" | |||||
- set "$@" external-ids:hostname="\"$(hostname -f)\"" | |||||
+ set "$@" external-ids:hostname="\"$(cat /proc/sys/kernel/hostname)\"" | |||||
set "$@" external-ids:rundir="\"$rundir\"" | |||||
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in | |||||
index 8665698..7931bc6 100644 | |||||
--- a/utilities/ovs-lib.in | |||||
+++ b/utilities/ovs-lib.in | |||||
@@ -157,7 +157,11 @@ install_dir () { | |||||
[ "${OVS_USER##*:}" != "" ] && INSTALL_GROUP="${OVS_USER##*:}" | |||||
if test ! -d "$DIR"; then | |||||
- install -d -m "$INSTALL_MODE" -o "$INSTALL_USER" -g "$INSTALL_GROUP" "$DIR" | |||||
+ mkdir -p "$DIR" | |||||
+ [ -n "$INSTALL_MODE" ] && chmod "$INSTALL_MODE" "$DIR" | |||||
+ local OWN="$INSTALL_USER" | |||||
+ [ -n "$OWN" ] && [ -n "$INSTALL_GROUP" ] && OWN="${OWN}:${INSTALL_GROUP}" | |||||
+ [ -n "$OWN" ] && chown "$OWN" "$DIR" | |||||
restorecon "$DIR" >/dev/null 2>&1 | |||||
fi | |||||
} |
@ -0,0 +1,33 @@ | |||||
From 05a6fa94778f9d6c54ca676de80708d03d6c365a Mon Sep 17 00:00:00 2001 | |||||
From: Yousong Zhou <yszhou4tech@gmail.com> | |||||
Date: Wed, 14 Mar 2018 16:40:01 +0800 | |||||
Subject: [PATCH 103/104] ovs-ctl: fix setting hostname | |||||
The command "hostname" is not available in OpenWrt by default. | |||||
The other thing to note is that currently kernel.hostname is not a fully | |||||
qualitied name | |||||
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> | |||||
--- | |||||
utilities/ovs-ctl.in | 4 +--- | |||||
1 file changed, 1 insertion(+), 3 deletions(-) | |||||
diff --git a/utilities/ovs-ctl.in b/utilities/ovs-ctl.in | |||||
index 4ddc450fb..52018e6d3 100755 | |||||
--- a/utilities/ovs-ctl.in | |||||
+++ b/utilities/ovs-ctl.in | |||||
@@ -68,9 +68,7 @@ ovs_vsctl () { | |||||
} | |||||
set_hostname () { | |||||
- # 'hostname -f' needs network connectivity to work. So we should | |||||
- # call this only after ovs-vswitchd is running. | |||||
- ovs_vsctl set Open_vSwitch . external-ids:hostname="$(hostname -f)" | |||||
+ ovs_vsctl set Open_vSwitch . external-ids:hostname="$(sysctl -n kernel.hostname)" | |||||
} | |||||
set_system_ids () { | |||||
-- | |||||
2.16.2 | |||||
@ -0,0 +1,31 @@ | |||||
From d8dd661e1c100a2d2ba0361cf6c91dcdedfeeb70 Mon Sep 17 00:00:00 2001 | |||||
From: Yousong Zhou <yszhou4tech@gmail.com> | |||||
Date: Wed, 14 Mar 2018 16:44:13 +0800 | |||||
Subject: [PATCH 104/104] ovs-lib: fix install_dir() | |||||
The command "install" is not available in OpenWrt by default | |||||
Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com> | |||||
--- | |||||
utilities/ovs-lib.in | 5 ++++- | |||||
1 file changed, 4 insertions(+), 1 deletion(-) | |||||
diff --git a/utilities/ovs-lib.in b/utilities/ovs-lib.in | |||||
index 1bccea0c5..457297f3f 100644 | |||||
--- a/utilities/ovs-lib.in | |||||
+++ b/utilities/ovs-lib.in | |||||
@@ -157,7 +157,10 @@ install_dir () { | |||||
[ "${OVS_USER##*:}" != "" ] && INSTALL_GROUP="${OVS_USER##*:}" | |||||
if test ! -d "$DIR"; then | |||||
- install -d -m "$INSTALL_MODE" -o "$INSTALL_USER" -g "$INSTALL_GROUP" "$DIR" | |||||
+ mkdir -p "$DIR" | |||||
+ chmod "$INSTALL_MODE" | |||||
+ chown "$INSTALL_USER" "$DIR" | |||||
+ chgrp "$INSTALL_GROUP" "$DIR" | |||||
restorecon "$DIR" >/dev/null 2>&1 | |||||
fi | |||||
} | |||||
-- | |||||
2.16.2 | |||||