diff --git a/content/os/installation/custom-builds/custom-kernels/_index.md b/content/os/installation/custom-builds/custom-kernels/_index.md index f6319f0087e..f30aaf6e65c 100644 --- a/content/os/installation/custom-builds/custom-kernels/_index.md +++ b/content/os/installation/custom-builds/custom-kernels/_index.md @@ -15,16 +15,15 @@ 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. ``` @@ -49,25 +48,21 @@ 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 - ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.1.18-arm64-3/linux-4.1.18-arm64.tar.gz + # 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 + ARG KERNEL_URL_arm64=https://github.com/imikushin/os-kernel/releases/download/Estuary-4.1.18-arm64-3/linux-4.1.18-arm64.tar.gz ``` -
- - > **Note:** `KERNEL_URL` settings should point to a Linux kernel, compiled and packaged in a specific way. You can fork [os-kernel repository](https://github.com/rancher/os-kernel) to package your own kernel. +> **Note:** `KERNEL_URL` settings should point to a Linux kernel, compiled and packaged in a specific way. You can fork [os-kernel repository](https://github.com/rancher/os-kernel) to package your own kernel. Your kernel should be packaged and published as a set of files of the following format: @@ -96,4 +91,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/cloud/gce/_index.md b/content/os/installation/running-rancheros/cloud/gce/_index.md index 4b19c198d84..2ba8ed6911d 100644 --- a/content/os/installation/running-rancheros/cloud/gce/_index.md +++ b/content/os/installation/running-rancheros/cloud/gce/_index.md @@ -1,5 +1,4 @@ --- -layout: list-docs title: Google Cloud Engine (GCE) weight: 106 --- diff --git a/layouts/_default/list.html b/layouts/_default/list.html index 4aa34796f51..8504f9e3b25 100644 --- a/layouts/_default/list.html +++ b/layouts/_default/list.html @@ -20,17 +20,12 @@ {{ partial "docs-nav.html" . }}
+ {{ if (gt (len .Sections) 0) }} -
+ {{end}} +
{{ .Content }} @@ -85,6 +80,10 @@ {{ template "_internal/pagination.html" . }} {{ partial "breadcrumbs.html" . }}
+
{{ end }} diff --git a/layouts/_default/single.html b/layouts/_default/single.html index 707c7a09eab..b493f884cf9 100644 --- a/layouts/_default/single.html +++ b/layouts/_default/single.html @@ -21,13 +21,7 @@