diff options
| author | bors <bors@rust-lang.org> | 2023-04-19 19:11:05 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-04-19 19:11:05 +0000 |
| commit | 9c51cf7e7ffd4ca1b7159657a76e1d4fbab18276 (patch) | |
| tree | 966375423147a92549520540aad967d289d9d464 /src/ci/docker/scripts | |
| parent | df0d9b492da81a647eedf17210cf55b86a44888c (diff) | |
| parent | 0820e31a00c02cdefe2e47a5b6c1df27ad531f69 (diff) | |
| download | rust-9c51cf7e7ffd4ca1b7159657a76e1d4fbab18276.tar.gz rust-9c51cf7e7ffd4ca1b7159657a76e1d4fbab18276.zip | |
Auto merge of #110546 - matthiaskrgr:rollup-346kik6, r=matthiaskrgr
Rollup of 10 pull requests
Successful merges:
- #110123 ('./configure' now checks if 'config.toml' exists before writing to that destination)
- #110429 (Spelling src bootstrap)
- #110430 (Spelling src ci)
- #110515 (Don't special-case download-rustc in `maybe_install_llvm`)
- #110521 (Fix `x test lint-docs linkchecker` when download-rustc is enabled)
- #110525 (Fix `tests/run-make-translation` when download-rustc is enabled)
- #110531 (small type system cleanup)
- #110533 (Missing blanket impl trait not public)
- #110540 (Fix wrong comment in rustc_hir/src/hir.rs)
- #110541 (Fix various configure bugs)
Failed merges:
r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/ci/docker/scripts')
| -rw-r--r-- | src/ci/docker/scripts/qemu-bare-bones-rcS | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ci/docker/scripts/qemu-bare-bones-rcS b/src/ci/docker/scripts/qemu-bare-bones-rcS index 3c29bedc13c..c5d807b2d7d 100644 --- a/src/ci/docker/scripts/qemu-bare-bones-rcS +++ b/src/ci/docker/scripts/qemu-bare-bones-rcS @@ -9,7 +9,7 @@ mount -t sysfs none /sys /addentropy < /addentropy cat /dev/urandom | head -n 2048 | /addentropy -# Set up IP that qemu expects. This confgures eth0 with the public IP that QEMU +# Set up IP that qemu expects. This configures eth0 with the public IP that QEMU # will communicate to as well as the loopback 127.0.0.1 address. ifconfig eth0 10.0.2.15 ifconfig lo up |