summaryrefslogtreecommitdiffhomepage
path: root/g3doc/user_guide
diff options
context:
space:
mode:
Diffstat (limited to 'g3doc/user_guide')
-rw-r--r--g3doc/user_guide/compatibility.md5
-rw-r--r--g3doc/user_guide/install.md9
2 files changed, 8 insertions, 6 deletions
diff --git a/g3doc/user_guide/compatibility.md b/g3doc/user_guide/compatibility.md
index 76e879a01..ef50c0147 100644
--- a/g3doc/user_guide/compatibility.md
+++ b/g3doc/user_guide/compatibility.md
@@ -42,6 +42,9 @@ Most common utilities work. Note that:
* Some tools, such as `tcpdump` and old versions of `ping`, require explicitly
enabling raw sockets via the unsafe `--net-raw` runsc flag.
+ * In case of tcpdump the following invocations will work
+ * tcpdump -i any
+ * tcpdump -i \<device-name\> -p (-p disables promiscuous mode)
* Different Docker images can behave differently. For example, Alpine Linux
and Ubuntu have different `ip` binaries.
@@ -82,7 +85,7 @@ Most common utilities work. Note that:
| sshd | Partially working. Job control [in progress](https://gvisor.dev/issue/154). |
| strace | Working. |
| tar | Working. |
-| tcpdump | Working. [Promiscuous mode in progress](https://gvisor.dev/issue/3333). |
+| tcpdump | Working [only with libpcap versions < 1.10](https://github.com/google/gvisor/issues/6699), [Promiscuous mode in progress](https://gvisor.dev/issue/3333). |
| top | Working. |
| uptime | Working. |
| vim | Working. |
diff --git a/g3doc/user_guide/install.md b/g3doc/user_guide/install.md
index 85ba6a161..73e953905 100644
--- a/g3doc/user_guide/install.md
+++ b/g3doc/user_guide/install.md
@@ -51,18 +51,17 @@ sudo apt-get install -y \
apt-transport-https \
ca-certificates \
curl \
- gnupg-agent \
- software-properties-common
+ gnupg
```
Next, configure the key used to sign archives and the repository.
NOTE: The key was updated on 2021-07-13 to replace the expired key. If you get
-errors about the key being expired, run the `apt-key add` command below again.
+errors about the key being expired, run the `curl` command below again.
```bash
-curl -fsSL https://gvisor.dev/archive.key | sudo apt-key add -
-sudo add-apt-repository "deb [arch=amd64,arm64] https://storage.googleapis.com/gvisor/releases release main"
+curl -fsSL https://gvisor.dev/archive.key | sudo gpg --dearmor -o /usr/share/keyrings/gvisor-archive-keyring.gpg
+echo "deb [arch=$(dpkg --print-architecture) signed-by=/usr/share/keyrings/gvisor-archive-keyring.gpg] https://storage.googleapis.com/gvisor/releases release main" | sudo tee /etc/apt/sources.list.d/gvisor.list > /dev/null
```
Now the runsc package can be installed: