summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLoïc Minier <lool@dooz.org>2007-09-30 18:09:30 +0200
committerLoïc Minier <lool@dooz.org>2007-09-30 18:09:30 +0200
commit8630b0a17445d5d185fda83205f787bf410977f8 (patch)
treefe0fba75fb225d94d90d69b4c6974fcb4628975b
parent1069163794dbe291d76d250930fd3279f268e3a8 (diff)
Hide "bind-type" in help string as it doesn't seem to be implemented
-rw-r--r--debian/changelog4
-rw-r--r--vconfig.c3
2 files changed, 6 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 31f89a7..d171686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -25,8 +25,10 @@ vlan (1.9-3) UNRELEASED; urgency=low
* Document that aliases are ignored by the vlan scripts; closes: #400827.
* Add debian/TODO list.
* Pass STRIP=true to the upstream build to avoid stripping; closes: #438253.
+ * Hide "bind-type" in help string as it doesn't seem to be implemented;
+ closes: #398807.
- -- Loic Minier <lool@dooz.org> Sun, 30 Sep 2007 18:04:17 +0200
+ -- Loic Minier <lool@dooz.org> Sun, 30 Sep 2007 18:09:19 +0200
vlan (1.9-2) unstable; urgency=medium
diff --git a/vconfig.c b/vconfig.c
index 5057cfd..c89cfa0 100644
--- a/vconfig.c
+++ b/vconfig.c
@@ -52,8 +52,11 @@ static char* usage =
"* vlan_qos is the 3 bit priority in the VLAN header\n"
"* name-type: VLAN_PLUS_VID (vlan0005), VLAN_PLUS_VID_NO_PAD (vlan5),\n"
" DEV_PLUS_VID (eth0.0005), DEV_PLUS_VID_NO_PAD (eth0.5)\n"
+// Debian: this option appears nowhere else in the source, see Debian #398807
+#if 0
"* bind-type: PER_DEVICE # Allows vlan 5 on eth0 and eth1 to be unique.\n"
" PER_KERNEL # Forces vlan 5 to be unique across all devices.\n"
+#endif
"* FLAGS: 1 REORDER_HDR When this is set, the VLAN device will move the\n"
" ethernet header around to make it look exactly like a real\n"
" ethernet device. This may help programs such as DHCPd which\n"