rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-14 07:04:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1496 from Silex/master

Browse Source 
Small fixes
This commit is contained in:
Josh Curl 2017-01-05 08:03:59 -08:00 committed by GitHub
commit f5c8cc1b53
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/control/install.go
View File

@ -30,8 +30,8 @@ var installCommand = cli.Command{
Name: "install-type, t", Name: "install-type, t",
Usage: `generic: (Default) Creates 1 ext4 partition and installs RancherOS Usage: `generic: (Default) Creates 1 ext4 partition and installs RancherOS
amazon-ebs: Installs RancherOS and sets up PV-GRUB amazon-ebs: Installs RancherOS and sets up PV-GRUB
syslinux: partition and format disk (mbr), 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 RnancherOS and setup Syslinux gptsyslinux: partition and format disk (gpt), then install RancherOS and setup Syslinux
`, `,
}, },
cli.StringFlag{ cli.StringFlag{

2
docs/os/contributing/index.md
View File

@ -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`, You can enable extra log information in the console by setting them using `sudo ros config set`,
or as kernel boot parameters. or as kernel boot parameters.
Enable all logging by setting `rancher.debug` true 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. You will also be able to view the debug logging information by running `dmesg` as root.

1
scripts/package-iso
View File

@ -9,7 +9,6 @@ CD=${BUILD}/cd
ISO=${ARTIFACTS}/$(echo ${DISTRIB_ID} | tr '[:upper:]' '[:lower:]').iso ISO=${ARTIFACTS}/$(echo ${DISTRIB_ID} | tr '[:upper:]' '[:lower:]').iso
CHECKSUM=iso-checksums.txt CHECKSUM=iso-checksums.txt
mkdir -p ${CD}/boot/isolinux
mkdir -p ${CD}/boot/isolinux mkdir -p ${CD}/boot/isolinux
if [ ! -f ${ARTIFACTS}/vmlinuz ] || [ ! -f ${ARTIFACTS}/initrd ]; then if [ ! -f ${ARTIFACTS}/vmlinuz ] || [ ! -f ${ARTIFACTS}/initrd ]; then