From 6f0e049f7af52ee5a91fc4e73ef7c8a27fdc6474 Mon Sep 17 00:00:00 2001 From: Denise Schannon Date: Wed, 25 Apr 2018 22:00:26 -0700 Subject: [PATCH] remove line breaks in numbered lists --- .../built-in-system-services/_index.md | 1 - .../custom-builds/custom-kernels/_index.md | 28 ++++++++----------- .../server/raspberry-pi/_index.md | 1 - 3 files changed, 12 insertions(+), 18 deletions(-) diff --git a/content/os/installation/boot-process/built-in-system-services/_index.md b/content/os/installation/boot-process/built-in-system-services/_index.md index 35797833487..f793f0348b1 100644 --- a/content/os/installation/boot-process/built-in-system-services/_index.md +++ b/content/os/installation/boot-process/built-in-system-services/_index.md @@ -28,7 +28,6 @@ This service provides the RancherOS user interface by running `sshd` and `getty` 1. If the `rancher.password=` kernel parameter exists, it sets `` as the password for the `rancher` user. 2. If there are no host SSH keys, it generates host SSH keys and saves them under `rancher.ssh.keys` in [cloud-config]({{< baseurl >}}/os/installation/configuration/#cloud-config). 3. Runs `cloud-init -execute`, which does the following: - * Updates `.ssh/authorized_keys` in `/home/rancher` and `/home/docker` from [cloud-config]({{< baseurl >}}/os/installation/configuration/ssh-keys/) and metadata. * Writes files specified by the `write_files` [cloud-config]({{< baseurl >}}/os/installation/configuration/write-files/) setting. * Resizes the device specified by the `rancher.resize_device` [cloud-config]({{< baseurl >}}/os/installation/configuration/resizing-device-partition/) setting. diff --git a/content/os/installation/custom-builds/custom-kernels/_index.md b/content/os/installation/custom-builds/custom-kernels/_index.md index f30aaf6e65c..5684e0b7145 100644 --- a/content/os/installation/custom-builds/custom-kernels/_index.md +++ b/content/os/installation/custom-builds/custom-kernels/_index.md @@ -15,17 +15,16 @@ We build the kernel for RancherOS at the [os-kernel repository](https://github.c $ git clone https://github.com/rancher/os-kernel.git ``` 2. In the `./Dockerfile.dapper` file, update the `KERNEL_TAG`, `KERNEL_VERSION`, `KERNEL_URL` and `KERNEL_SHA1`. `KERNEL_URL` points to Linux kernel sources archive, packaged as `.tar.gz` or `.tar.xz`. `KERNEL_SHA1` is the `SHA1` sum of the kernel sources archive. -`./Dockerfile.dapper` file - ```bash - ########## Kernel version Configuration ############################# - ENV KERNEL_TAG=v4.8.7 - ENV KERNEL_VERSION=4.8.7-rancher - ENV KERNEL_SHA1=5c10724a0e7e97b72046be841df0c69c6e2a03c2 - ENV KERNEL_URL=https://github.com/rancher/linux/archive/${KERNEL_TAG}.tar.gz - ``` + `./Dockerfile.dapper` file + ```bash + ########## Kernel version Configuration ############################# + ENV KERNEL_TAG=v4.8.7 + ENV KERNEL_VERSION=4.8.7-rancher + ENV KERNEL_SHA1=5c10724a0e7e97b72046be841df0c69c6e2a03c2 + ENV KERNEL_URL=https://github.com/rancher/linux/archive/${KERNEL_TAG}.tar.gz + ``` 3. After you've replaced the `KERNEL_*` values, run `make` in the root `os-kernel` directory. After the build is completed, a `./dist/kernel` directory will be created with the freshly built kernel tarball and headers. - ``` $ make ...snip... @@ -38,7 +37,6 @@ We build the kernel for RancherOS at the [os-kernel repository](https://github.c Images ready to push: rancher/os-extras:4.8.7-rancher rancher/os-headers:4.8.7-rancher - ``` Now you need to either upload the `./dist/kernel/linux-4.8.7-rancher-x86.tar.gz` file to somewhere, or copy that file into your clone of the `rancher/os` repo, as `assets/kernel.tar.gz`. @@ -48,14 +46,12 @@ The `build-.tar.gz` and `extra-.tar.gz` files are used to build the ### Building a RancherOS release using the Packaged kernel files. By default, RancherOS ships with the kernel provided by the [os-kernel repository](https://github.com/rancher/os-kernel). Swapping out the default kernel can by done by [building your own custom RancherOS ISO]({{< baseurl >}}/os/installation/custom-builds/custom-rancheros-iso/). - -1. Create a clone of the main [RancherOS repository](https://github.com/rancher/os) to your local machine with a `git clone`. + 1. Create a clone of the main [RancherOS repository](https://github.com/rancher/os) to your local machine with a `git clone`. ``` $ git clone https://github.com/rancher/os.git ``` -2. In the root of the repository, the "General Configuration" section of `Dockerfile.dapper` will need to be updated. Using your favorite editor, replace the appropriate `KERNEL_URL` value with a URL of your compiled custom kernel tarball. Ideally, the URL will use `HTTPS`. - `Dockerfile.dapper` file - + 2. In the root of the repository, the "General Configuration" section of `Dockerfile.dapper` will need to be updated. Using your favorite editor, replace the appropriate `KERNEL_URL` value with a URL of your compiled custom kernel tarball. Ideally, the URL will use `HTTPS`. + `Dockerfile.dapper` file ``` # Update the URL to your own custom kernel tarball ARG KERNEL_URL_amd64=https://github.com/rancher/os-kernel/releases/download/Ubuntu-4.4.0-23.41-rancher/linux-4.4.10-rancher-x86.tar.gz @@ -91,4 +87,4 @@ By default, RancherOS ships with the kernel provided by the [os-kernel repositor firmware/ ... ``` -3. After you've replaced the URL with your custom kernel, you can follow the steps in [building your own custom RancherOS ISO]({{< baseurl >}}/os/installation/custom-builds/custom-rancheros-iso/). + 3. After you've replaced the URL with your custom kernel, you can follow the steps in [building your own custom RancherOS ISO]({{< baseurl >}}/os/installation/custom-builds/custom-rancheros-iso/). diff --git a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md index c8b66eaf97e..399664375b4 100644 --- a/content/os/installation/running-rancheros/server/raspberry-pi/_index.md +++ b/content/os/installation/running-rancheros/server/raspberry-pi/_index.md @@ -29,7 +29,6 @@ RancherOS does not currently expand the root partition to fill the remainder of 9. `sudo ros config set mounts "[['/dev/mmcblk0p3','/mnt/docker','ext4','']]"` to preserve this mount after reboots 10. `sudo mount /dev/mmcblk0p3 /mnt/docker` to mount the Docker root 11. `sudo system-docker restart docker` to restart Docker using the new root - If this is not a new installation, you'll have to copy over your existing Docker root (`/var/lib/docker`) to the new root (`/mnt/docker`). 1. `sudo cp -R /var/lib/docker/* /mnt/docker` to recursively copy all files 2. `sudo system-docker restart docker` to restart Docker using the new root