From a6153c37e6355d57a41f97ece606315f68eda5b3 Mon Sep 17 00:00:00 2001 From: Philippe Vaucher Date: Thu, 5 Jan 2017 10:47:59 +0100 Subject: [PATCH 1/2] Remove duplicate line in scripts/package-iso --- scripts/package-iso | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/package-iso b/scripts/package-iso index 487fb553..4048eb2a 100755 --- a/scripts/package-iso +++ b/scripts/package-iso @@ -9,7 +9,6 @@ CD=${BUILD}/cd ISO=${ARTIFACTS}/$(echo ${DISTRIB_ID} | tr '[:upper:]' '[:lower:]').iso CHECKSUM=iso-checksums.txt -mkdir -p ${CD}/boot/isolinux mkdir -p ${CD}/boot/isolinux if [ ! -f ${ARTIFACTS}/vmlinuz ] || [ ! -f ${ARTIFACTS}/initrd ]; then From 8443aa43daad7854c8cd365489093935e3ff1108 Mon Sep 17 00:00:00 2001 From: Philippe Vaucher Date: Thu, 5 Jan 2017 12:29:09 +0100 Subject: [PATCH 2/2] Fix typos --- cmd/control/install.go | 4 ++-- docs/os/contributing/index.md | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmd/control/install.go b/cmd/control/install.go index 2d70d7f6..4e6b6cd0 100755 --- a/cmd/control/install.go +++ b/cmd/control/install.go @@ -30,8 +30,8 @@ var installCommand = cli.Command{ Name: "install-type, t", Usage: `generic: (Default) Creates 1 ext4 partition and installs RancherOS amazon-ebs: Installs RancherOS and sets up PV-GRUB - syslinux: partition and format disk (mbr), then install RnancherOS and setup Syslinux - gptsyslinux: partition and format disk (gpt), then install RnancherOS and setup Syslinux + syslinux: partition and format disk (mbr), then install RancherOS and setup Syslinux + gptsyslinux: partition and format disk (gpt), then install RancherOS and setup Syslinux `, }, cli.StringFlag{ diff --git a/docs/os/contributing/index.md b/docs/os/contributing/index.md index ffe60a9a..0ce612d7 100644 --- a/docs/os/contributing/index.md +++ b/docs/os/contributing/index.md @@ -53,7 +53,7 @@ If you're on OS X, you can run RancherOS using [_xhyve_](https://github.com/mist You can enable extra log information in the console by setting them using `sudo ros config set`, or as kernel boot parameters. Enable all logging by setting `rancher.debug` true -or you can set `rancher.docker.debug`, `racher.system_docker.debug`, `rancher.bootstrap_docker.debug`, or `rancher.log` individually. +or you can set `rancher.docker.debug`, `rancher.system_docker.debug`, `rancher.bootstrap_docker.debug`, or `rancher.log` individually. You will also be able to view the debug logging information by running `dmesg` as root.