diff --git a/cmd/control/install.go b/cmd/control/install.go index cd438056..82368175 100755 --- a/cmd/control/install.go +++ b/cmd/control/install.go @@ -74,6 +74,10 @@ var installCommand = cli.Command{ Name: "kexec", Usage: "reboot using kexec", }, + cli.BoolFlag{ + Name: "debug", + Usage: "Run installer with debug output", + }, }, } @@ -81,6 +85,13 @@ func installAction(c *cli.Context) error { if c.Args().Present() { log.Fatalf("invalid arguments %v", c.Args()) } + + if c.Bool("debug") { + originalLevel := log.GetLevel() + defer log.SetLevel(originalLevel) + log.SetLevel(log.DebugLevel) + } + kappend := strings.TrimSpace(c.String("append")) force := c.Bool("force") kexec := c.Bool("kexec") diff --git a/log/log.go b/log/log.go index 4b905a4d..b9339e91 100755 --- a/log/log.go +++ b/log/log.go @@ -46,6 +46,13 @@ func SetLevel(level Level) { } } +func GetLevel() Level { + if userHook != nil { + return Level(userHook.Level) + } + return Level(appLog.Level) +} + func Debugf(format string, args ...interface{}) { appLog.Debugf(format, args...) } diff --git a/scripts/installer/BaseDockerfile.amd64 b/scripts/installer/BaseDockerfile.amd64 index 2bfd7198..4bdb267d 100644 --- a/scripts/installer/BaseDockerfile.amd64 +++ b/scripts/installer/BaseDockerfile.amd64 @@ -19,5 +19,10 @@ COPY ./build/ros /bin/ RUN ln -s /bootiso/boot/ /dist +# need to make a /scripts/set-disk-partitions so that older releases can call the installer +RUN echo "#!/bin/sh" > /scripts/set-disk-partitions \ + && echo "echo 'set-disk-partitions deprecated'" >> /scripts/set-disk-partitions \ + && chmod 755 /scripts/set-disk-partitions + ENTRYPOINT ["/bin/ros", "install"] diff --git a/scripts/installer/Dockerfile.amd64 b/scripts/installer/Dockerfile.amd64 index ddd1fbfa..2b837420 100755 --- a/scripts/installer/Dockerfile.amd64 +++ b/scripts/installer/Dockerfile.amd64 @@ -4,6 +4,4 @@ FROM rancher/os-installer RUN rm /dist/ \ && mkdir -p /dist/ -#COPY ./ros /bin/ COPY ./boot/ /dist/ -