Skip to content

Commit 4979840

Browse files
christoph-zededaeriknordmark
authored andcommitted
Revert "hypervisor: don't init in install mode"
This reverts commit 8b66837. Signed-off-by: Christoph Ostarek <[email protected]>
1 parent 171eb7f commit 4979840

File tree

2 files changed

+0
-9
lines changed

2 files changed

+0
-9
lines changed

pkg/mkimage-raw-efi/install

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,6 @@ BAIL_FINAL_CMD=${BAIL_FINAL_CMD:-"exit 1"}
3131
# the contents of this file are saved to $REPORT/installer.log
3232
# After the USB install, users can see the installation status under /Volumes/INVENTORY/<serial#>/installer.log
3333
LOGFILE_DIR="/run"
34-
35-
# pillar behaves differently if this file exists to check if it is running in installer mode - see hypervisor.go
3634
LOGFILE="$LOGFILE_DIR/installer.log"
3735
# logs to both console and a file.
3836
logmsg() {

pkg/pillar/hypervisor/hypervisor.go

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import (
1010
"os"
1111

1212
"github.com/lf-edge/eve/pkg/pillar/types"
13-
fileutils "github.com/lf-edge/eve/pkg/pillar/utils/file"
1413
"github.com/shirou/gopsutil/cpu"
1514
"github.com/shirou/gopsutil/mem"
1615
"github.com/sirupsen/logrus"
@@ -19,12 +18,6 @@ import (
1918
var currentHypervisor Hypervisor
2019

2120
func init() {
22-
if fileutils.FileExists(nil, "/run/installer.log") {
23-
// if this file exists it means we're running in the installer and we should not inititialize the containerd
24-
// hypervisor as it interferes with the installer
25-
return
26-
}
27-
2821
var err error
2922

3023
flagSet := flag.NewFlagSet("", flag.ExitOnError)

0 commit comments

Comments
 (0)