mirror of
https://github.com/rancher/os.git
synced 2025-07-29 22:00:38 +00:00
Don't need host dev mount for pre-created partition
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
parent
da5cab621a
commit
2f28a00e02
@ -97,7 +97,8 @@ func installAction(c *cli.Context) error {
|
||||
log.Fatalf("invalid arguments %v", c.Args())
|
||||
}
|
||||
|
||||
if c.Bool("debug") {
|
||||
debug := c.Bool("debug")
|
||||
if debug {
|
||||
originalLevel := log.GetLevel()
|
||||
defer log.SetLevel(originalLevel)
|
||||
log.SetLevel(log.DebugLevel)
|
||||
@ -154,7 +155,7 @@ func installAction(c *cli.Context) error {
|
||||
cloudConfig = uc
|
||||
}
|
||||
|
||||
if err := runInstall(image, installType, cloudConfig, device, partition, kappend, force, kexec, isoinstallerloaded); err != nil {
|
||||
if err := runInstall(image, installType, cloudConfig, device, partition, kappend, force, kexec, isoinstallerloaded, debug); err != nil {
|
||||
log.WithFields(log.Fields{"err": err}).Fatal("Failed to run install")
|
||||
return err
|
||||
}
|
||||
@ -167,7 +168,7 @@ func installAction(c *cli.Context) error {
|
||||
return nil
|
||||
}
|
||||
|
||||
func runInstall(image, installType, cloudConfig, device, partition, kappend string, force, kexec, isoinstallerloaded bool) error {
|
||||
func runInstall(image, installType, cloudConfig, device, partition, kappend string, force, kexec, isoinstallerloaded, debug bool) error {
|
||||
fmt.Printf("Installing from %s\n", image)
|
||||
|
||||
if !force {
|
||||
@ -278,6 +279,9 @@ func runInstall(image, installType, cloudConfig, device, partition, kappend stri
|
||||
if kexec {
|
||||
installerCmd = append(installerCmd, "--kexec")
|
||||
}
|
||||
if debug {
|
||||
installerCmd = append(installerCmd, "--debug")
|
||||
}
|
||||
|
||||
// TODO: mount at /mnt for shared mount?
|
||||
if useIso {
|
||||
@ -300,10 +304,7 @@ func runInstall(image, installType, cloudConfig, device, partition, kappend stri
|
||||
|
||||
log.Debugf("running installation")
|
||||
|
||||
if partition != "" {
|
||||
device = "/host" + device
|
||||
partition = "/host" + partition
|
||||
} else {
|
||||
if partition == "" {
|
||||
if installType == "generic" ||
|
||||
installType == "syslinux" ||
|
||||
installType == "gptsyslinux" {
|
||||
|
@ -47,7 +47,6 @@ sudo kpartx -a ${DISK}
|
||||
|
||||
docker run --privileged -it --rm \
|
||||
-v /dev/mapper:/dev/mapper \
|
||||
-v /:/host \
|
||||
-v ${STATE}:/cluster \
|
||||
rancher/os:${VERSION} \
|
||||
--isoinstallerloaded=1 \
|
||||
|
Loading…
Reference in New Issue
Block a user