rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-22 16:45:39 +00:00
Code Issues Releases Wiki Activity

quieten the debug messages for install, fix pre-0.8.0-rc2 installer calling

Browse Source 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit 2016-12-07 21:56:32 +10:00
parent 1a0e818328
commit d90217ab06
3 changed files with 86 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

119
cmd/control/install.go
View File

@ -9,6 +9,7 @@ import (
"os" "os"
"os/exec" "os/exec"
"path/filepath" "path/filepath"
"strconv"
"strings" "strings"
"text/template" "text/template"
@ -140,8 +141,13 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
installType == "syslinux" || installType == "syslinux" ||
installType == "gptsyslinux" { installType == "gptsyslinux" {
// TODO: generalise to versions before 0.8.0-rc2 // Versions before 0.8.0-rc2 use the old calling convention (from the lay-down-os shell script)
if image == "rancher/os:v0.7.0" { imageVersion := strings.TrimPrefix(image, "rancher/os:v")
if image != imageVersion {
imageVersion = strings.Replace(imageVersion, "-", ".", -1)
vArray := strings.Split(imageVersion, ".")
v, _ := strconv.ParseFloat(vArray[0]+"."+vArray[1], 32)
if v < 0.8 || imageVersion == "0.8.0-rc1" {
log.Infof("starting installer container for %s", image) log.Infof("starting installer container for %s", image)
if installType == "generic" { if installType == "generic" {
cmd := exec.Command("system-docker", "run", "--net=host", "--privileged", "--volumes-from=all-volumes", cmd := exec.Command("system-docker", "run", "--net=host", "--privileged", "--volumes-from=all-volumes",
@ -159,14 +165,12 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
} }
return nil return nil
} }
}
useIso := false useIso := false
if !mountiso { if !mountiso {
if _, err := os.Stat("/dist/initrd"); os.IsNotExist(err) { if _, err := os.Stat("/dist/initrd"); os.IsNotExist(err) {
log.Infof("trying to mount /dev/sr0 and then load image")
if err = mountBootIso(); err == nil { if err = mountBootIso(); err == nil {
log.Infof("Mounted /dev/sr0")
if _, err := os.Stat("/bootiso/rancheros/"); err == nil { if _, err := os.Stat("/bootiso/rancheros/"); err == nil {
cmd := exec.Command("system-docker", "load", "-i", "/bootiso/rancheros/installer.tar.gz") cmd := exec.Command("system-docker", "load", "-i", "/bootiso/rancheros/installer.tar.gz")
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
@ -231,12 +235,11 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
// TODO: needs to pass the log level on to the container // TODO: needs to pass the log level on to the container
log.InitLogger() log.InitLogger()
log.SetLevel(log.DebugLevel) log.SetLevel(log.InfoLevel)
log.Infof("running installation") log.Infof("running installation")
if installType == "generic" { if installType == "generic" {
log.Infof("running setDiskpartitions")
err := setDiskpartitions(device) err := setDiskpartitions(device)
if err != nil { if err != nil {
log.Errorf("error setDiskpartitions %s", err) log.Errorf("error setDiskpartitions %s", err)
@ -244,17 +247,15 @@ func runInstall(image, installType, cloudConfig, device, kappend string, force,
} }
// use the bind mounted host filesystem to get access to the /dev/vda1 device that udev on the host sets up (TODO: can we run a udevd inside the container? `mknod b 253 1 /dev/vda1` doesn't work) // use the bind mounted host filesystem to get access to the /dev/vda1 device that udev on the host sets up (TODO: can we run a udevd inside the container? `mknod b 253 1 /dev/vda1` doesn't work)
device = "/host" + device device = "/host" + device
log.Infof("done setDiskpartitions")
} }
if mountiso { if mountiso {
// TODO: I hope to remove this from here later. // TODO: I hope to remove this from here later.
if err := mountBootIso(); err == nil { if err := mountBootIso(); err != nil {
log.Infof("Mounted /dev/sr0") return err
} }
} }
log.Infof("running layDownOS")
err := layDownOS(image, installType, cloudConfig, device, kappend) err := layDownOS(image, installType, cloudConfig, device, kappend)
if err != nil { if err != nil {
log.Infof("error layDownOS %s", err) log.Infof("error layDownOS %s", err)
@ -273,19 +274,48 @@ func mountBootIso() error {
// TODO: need to add a label to the iso and mount using that. // TODO: need to add a label to the iso and mount using that.
// ARGH! need to mount this in the host - or share it as a volume.. // ARGH! need to mount this in the host - or share it as a volume..
os.MkdirAll("/bootiso", 0755) os.MkdirAll("/bootiso", 0755)
cmd := exec.Command("mount", "-t", "iso9660", "/dev/sr0", "/bootiso")
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr deviceName := "/dev/sr0"
err := cmd.Run() deviceType := "iso9660"
// find the installation device
cmd := exec.Command("blkid", "-L", "RancherOS")
log.Debugf("Run(%v)", cmd)
cmd.Stderr = os.Stderr
out, err := cmd.Output()
if err != nil { if err != nil {
log.Infof("tried and failed to mount /dev/sr0: %s", err) log.Errorf("Failed to get RancherOS boot device: %s", err)
return err
}
deviceName = strings.TrimSpace(string(out))
log.Debugf("blkid found -L RancherOS: %s", deviceName)
cmd = exec.Command("blkid", deviceName)
log.Debugf("Run(%v)", cmd)
cmd.Stderr = os.Stderr
if out, err = cmd.Output(); err != nil {
log.Errorf("Failed to get RancherOS boot device type: %s", err)
return err
}
deviceType = strings.TrimSpace(string(out))
s1 := strings.Split(deviceType, "TYPE=\"")
s2 := strings.Split(s1[1], "\"")
deviceType = s2[0]
log.Debugf("blkid type of %s: %s", deviceName, deviceType)
cmd = exec.Command("mount", "-t", deviceType, deviceName, "/bootiso")
log.Debugf("Run(%v)", cmd)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
err = cmd.Run()
if err != nil {
log.Errorf("tried and failed to mount %s: %s", deviceName, err)
} else { } else {
log.Infof("Mounted /dev/sr0") log.Debugf("Mounted %s", deviceName)
} }
return err return err
} }
func layDownOS(image, installType, cloudConfig, device, kappend string) error { func layDownOS(image, installType, cloudConfig, device, kappend string) error {
log.Infof("layDownOS")
// ENV == installType // ENV == installType
//[[ "$ARCH" == "arm" && "$ENV" != "rancher-upgrade" ]] && ENV=arm //[[ "$ARCH" == "arm" && "$ENV" != "rancher-upgrade" ]] && ENV=arm
@ -309,7 +339,7 @@ func layDownOS(image, installType, cloudConfig, device, kappend string) error {
switch installType { switch installType {
case "generic": case "generic":
log.Infof("formatAndMount") log.Debugf("formatAndMount")
var err error var err error
bootDir, err = formatAndMount(baseName, bootDir, device, partition) bootDir, err = formatAndMount(baseName, bootDir, device, partition)
if err != nil { if err != nil {
@ -318,20 +348,20 @@ func layDownOS(image, installType, cloudConfig, device, kappend string) error {
} }
//log.Infof("installGrub") //log.Infof("installGrub")
//err = installGrub(baseName, device) //err = installGrub(baseName, device)
log.Infof("installSyslinux") log.Debugf("installSyslinux")
err = installSyslinux(device, baseName, bootDir) err = installSyslinux(device, baseName, bootDir)
if err != nil { if err != nil {
log.Errorf("%s", err) log.Errorf("%s", err)
return err return err
} }
log.Infof("seedData") log.Debugf("seedData")
err = seedData(baseName, cloudConfig, FILES) err = seedData(baseName, cloudConfig, FILES)
if err != nil { if err != nil {
log.Errorf("%s", err) log.Errorf("%s", err)
return err return err
} }
log.Infof("seedData done") log.Debugf("seedData done")
case "arm": case "arm":
var err error var err error
bootDir, err = formatAndMount(baseName, bootDir, device, partition) bootDir, err = formatAndMount(baseName, bootDir, device, partition)
@ -502,20 +532,19 @@ func setDiskpartitions(device string) error {
} }
} }
if !exists { if !exists {
log.Debugf("disk %s not found", device) return fmt.Errorf("disk %s not found: %s", device, err)
return err
} }
if haspartitions { if haspartitions {
log.Debugf("device %s already partitioned - checking if any are mounted", device) log.Debugf("device %s already partitioned - checking if any are mounted", device)
file, err := os.Open("/proc/mounts") file, err := os.Open("/proc/mounts")
if err != nil { if err != nil {
log.Debugf("failed to read /proc/mounts %s", err) log.Errorf("failed to read /proc/mounts %s", err)
return err return err
} }
defer file.Close() defer file.Close()
if partitionMounted(device, file) { if partitionMounted(device, file) {
err = fmt.Errorf("partition %s mounted, cannot repartition", device) err = fmt.Errorf("partition %s mounted, cannot repartition", device)
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
cmd := exec.Command("system-docker", "ps", "-q") cmd := exec.Command("system-docker", "ps", "-q")
@ -535,12 +564,12 @@ func setDiskpartitions(device string) error {
cmd := exec.Command("system-docker", "exec", image, "cat /proc/mount") cmd := exec.Command("system-docker", "exec", image, "cat /proc/mount")
cmd.Stdout = w cmd.Stdout = w
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
} }
}() }()
if partitionMounted(device, r) { if partitionMounted(device, r) {
err = fmt.Errorf("partition %s mounted in %s, cannot repartition", device, image) err = fmt.Errorf("partition %s mounted in %s, cannot repartition", device, image)
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
} }
@ -548,16 +577,16 @@ func setDiskpartitions(device string) error {
//do it! //do it!
log.Debugf("running dd") log.Debugf("running dd")
cmd := exec.Command("dd", "if=/dev/zero", "of="+device, "bs=512", "count=2048") cmd := exec.Command("dd", "if=/dev/zero", "of="+device, "bs=512", "count=2048")
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr //cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
log.Debugf("running partprobe") log.Debugf("running partprobe")
cmd = exec.Command("partprobe", device) cmd = exec.Command("partprobe", device)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr //cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
@ -577,9 +606,9 @@ w
log.Debugf("running fdisk") log.Debugf("running fdisk")
cmd = exec.Command("fdisk", device) cmd = exec.Command("fdisk", device)
cmd.Stdin = r cmd.Stdin = r
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr //cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
@ -598,7 +627,7 @@ func partitionMounted(device string, file io.Reader) bool {
} }
} }
if err := scanner.Err(); err != nil { if err := scanner.Err(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return false return false
} }
} }
@ -612,9 +641,9 @@ func formatdevice(device, partition string) error {
// -O ^64bit: for syslinux: http://www.syslinux.org/wiki/index.php?title=Filesystem#ext // -O ^64bit: for syslinux: http://www.syslinux.org/wiki/index.php?title=Filesystem#ext
cmd := exec.Command("mkfs.ext4", "-F", "-i", "4096", "-O", "^64bit", "-L", "RANCHER_STATE", partition) cmd := exec.Command("mkfs.ext4", "-F", "-i", "4096", "-O", "^64bit", "-L", "RANCHER_STATE", partition)
log.Debugf("Run(%v)", cmd) log.Debugf("Run(%v)", cmd)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr //cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Debugf("mkfs.ext4: %s", err) log.Errorf("mkfs.ext4: %s", err)
return err return err
} }
return nil return nil
@ -650,7 +679,7 @@ func mountdevice(baseName, bootDir, partition string, raw bool) (string, error)
os.MkdirAll(baseName, 0755) os.MkdirAll(baseName, 0755)
cmd = exec.Command("mount", rootfs, baseName) cmd = exec.Command("mount", rootfs, baseName)
log.Debugf("Run(%v)", cmd) log.Debugf("Run(%v)", cmd)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr //cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
return bootDir, cmd.Run() return bootDir, cmd.Run()
} }
@ -692,10 +721,10 @@ func installSyslinux(device, baseName, bootDir string) error {
// ubuntu: /usr/lib/syslinux/mbr/mbr.bin // ubuntu: /usr/lib/syslinux/mbr/mbr.bin
// alpine: /usr/share/syslinux/mbr.bin // alpine: /usr/share/syslinux/mbr.bin
cmd := exec.Command("dd", "bs=440", "count=1", "if=/usr/share/syslinux/mbr.bin", "of="+device) cmd := exec.Command("dd", "bs=440", "count=1", "if=/usr/share/syslinux/mbr.bin", "of="+device)
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr //cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
log.Debugf("Run(%v)", cmd) log.Debugf("Run(%v)", cmd)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("dd: %s", err) log.Errorf("dd: %s", err)
return err return err
} }
//cp /usr/lib/syslinux/modules/bios/* ${baseName}/${bootDir}syslinux //cp /usr/lib/syslinux/modules/bios/* ${baseName}/${bootDir}syslinux
@ -712,10 +741,10 @@ func installSyslinux(device, baseName, bootDir string) error {
//extlinux --install ${baseName}/${bootDir}syslinux //extlinux --install ${baseName}/${bootDir}syslinux
cmd = exec.Command("extlinux", "--install", filepath.Join(baseName, bootDir+"syslinux")) cmd = exec.Command("extlinux", "--install", filepath.Join(baseName, bootDir+"syslinux"))
cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr //cmd.Stdout, cmd.Stderr = os.Stdout, os.Stderr
log.Debugf("Run(%v)", cmd) log.Debugf("Run(%v)", cmd)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("extlinuux: %s", err) log.Errorf("extlinuux: %s", err)
return err return err
} }
return nil return nil
@ -730,12 +759,12 @@ func installSyslinuxRaid(baseName, bootDir string) error {
//extlinux --install --raid ${baseName}/${bootDir}syslinux //extlinux --install --raid ${baseName}/${bootDir}syslinux
cmd := exec.Command("dd", "bs=440", "count=1", "if=/usr/share/syslinux/mbr.bin", "of=/dev/sda") cmd := exec.Command("dd", "bs=440", "count=1", "if=/usr/share/syslinux/mbr.bin", "of=/dev/sda")
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
cmd = exec.Command("dd", "bs=440", "count=1", "if=/usr/share/syslinux/mbr.bin", "of=/dev/sdb") cmd = exec.Command("dd", "bs=440", "count=1", "if=/usr/share/syslinux/mbr.bin", "of=/dev/sdb")
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
//cp /usr/lib/syslinux/modules/bios/* ${baseName}/${bootDir}syslinux //cp /usr/lib/syslinux/modules/bios/* ${baseName}/${bootDir}syslinux
@ -751,7 +780,7 @@ func installSyslinuxRaid(baseName, bootDir string) error {
} }
cmd = exec.Command("extlinux", "--install", filepath.Join(baseName, bootDir+"syslinux")) cmd = exec.Command("extlinux", "--install", filepath.Join(baseName, bootDir+"syslinux"))
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
return nil return nil
@ -763,7 +792,7 @@ func installGrub(baseName, device string) error {
//grub-install --boot-directory=${baseName}/boot ${device} //grub-install --boot-directory=${baseName}/boot ${device}
cmd := exec.Command("grub-install", "--boot-directory="+baseName+"/boot", device) cmd := exec.Command("grub-install", "--boot-directory="+baseName+"/boot", device)
if err := cmd.Run(); err != nil { if err := cmd.Run(); err != nil {
log.Printf("%s", err) log.Errorf("%s", err)
return err return err
} }
return nil return nil

1
os-config.tpl.yml
View File

@ -1,5 +1,4 @@
rancher: rancher:
debug: true
environment: environment:
VERSION: {{.VERSION}} VERSION: {{.VERSION}}
SUFFIX: {{.SUFFIX}} SUFFIX: {{.SUFFIX}}

2
scripts/isolinux.cfg
View File

@ -1,5 +1,5 @@
TIMEOUT 20 #2s TIMEOUT 20 #2s
PROMPT 1 #PROMPT 1
# doesn't appear to work here? # doesn't appear to work here?
INCLUDE ../global.cfg INCLUDE ../global.cfg