Skip to content

Commit

Permalink
Update u-root from 6.0.0 -> 7.0.0 (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
majst01 authored Nov 23, 2020
1 parent 76e9e31 commit 4e6b4a8
Show file tree
Hide file tree
Showing 12 changed files with 29 additions and 18 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
FROM metalstack/builder:latest as builder

FROM registry.fi-ts.io/metal/supermicro:2.4.0 as sum
FROM registry.fi-ts.io/metal/supermicro:2.5.0 as sum

FROM golang:1.13-buster as initrd-builder
ENV UROOT_GIT_SHA_OR_TAG=v6.0.0
FROM golang:1.14-buster as initrd-builder
ENV UROOT_GIT_SHA_OR_TAG=v7.0.0
RUN apt-get update \
&& apt-get install -y --no-install-recommends \
curl \
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ clean::

${INITRD_COMPRESSED}:
rm -f ${INITRD_COMPRESSED}
docker-make --no-push --Lint --no-cache
docker-make --no-push --Lint

.PHONY: initrd
initrd: ${INITRD_COMPRESSED}
Expand Down
3 changes: 2 additions & 1 deletion cmd/bios.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package cmd

import (
"time"

"github.com/metal-stack/metal-hammer/cmd/event"
"github.com/metal-stack/metal-hammer/pkg/kernel"
"time"

log "github.com/inconshreveable/log15"
)
Expand Down
3 changes: 2 additions & 1 deletion cmd/firmware/firmware.go
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package firmware

import (
"os/exec"

log "github.com/inconshreveable/log15"
"github.com/pkg/errors"
"os/exec"
)

// updater check if a firmware update is required and updates
Expand Down
4 changes: 3 additions & 1 deletion cmd/image/image.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,21 @@ package image

import (
"fmt"

log "github.com/inconshreveable/log15"
"github.com/mholt/archiver"
lz4 "github.com/pierrec/lz4"
pb "gopkg.in/cheggaaa/pb.v1"

"crypto/md5"
"github.com/pkg/errors"
"io"
"io/ioutil"
"net/http"
"os"
"strings"
"time"

"github.com/pkg/errors"
)

// Pull a image from s3
Expand Down
3 changes: 2 additions & 1 deletion cmd/network/ntpdate.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@ package network

import (
"fmt"
log "github.com/inconshreveable/log15"
"syscall"
"time"

log "github.com/inconshreveable/log15"

"github.com/beevik/ntp"
)

Expand Down
5 changes: 3 additions & 2 deletions cmd/reinstall.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@ package cmd

import (
"fmt"
"strings"
"time"

log "github.com/inconshreveable/log15"
"github.com/jaypipes/ghw"
"github.com/metal-stack/metal-hammer/cmd/event"
Expand All @@ -10,8 +13,6 @@ import (
"github.com/metal-stack/metal-hammer/metal-core/models"
"github.com/metal-stack/metal-hammer/pkg/kernel"
"github.com/pkg/errors"
"strings"
"time"
)

// fetchMachine requests the machine data of given machine ID
Expand Down
3 changes: 2 additions & 1 deletion cmd/storage/mount.go
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
package storage

import (
"github.com/pkg/errors"
"os"
"path/filepath"
"syscall"

"github.com/pkg/errors"

log "github.com/inconshreveable/log15"
)

Expand Down
6 changes: 3 additions & 3 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
module github.com/metal-stack/metal-hammer

go 1.15

require (
github.com/beevik/ntp v0.3.0
github.com/dsnet/compress v0.0.1 // indirect
Expand Down Expand Up @@ -28,7 +30,7 @@ require (
github.com/pierrec/lz4 v2.5.2+incompatible
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.6.1
github.com/u-root/u-root v6.0.0+incompatible
github.com/u-root/u-root v7.0.0+incompatible
github.com/vishvananda/netlink v1.1.0
github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae // indirect
golang.org/x/sys v0.0.0-20201117222635-ba5294a509c7
Expand All @@ -38,5 +40,3 @@ require (
)

replace github.com/mholt/archiver => github.com/mholt/archiver v2.1.0+incompatible

go 1.15
2 changes: 2 additions & 0 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,8 @@ github.com/tidwall/pretty v1.0.1/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhV
github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
github.com/u-root/u-root v6.0.0+incompatible h1:YqPGmRoRyYmeg17KIWFRSyVq6LX5T6GSzawyA6wG6EE=
github.com/u-root/u-root v6.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
github.com/u-root/u-root v7.0.0+incompatible h1:u+KSS04pSxJGI5E7WE4Bs9+Zd75QjFv+REkjy/aoAc8=
github.com/u-root/u-root v7.0.0+incompatible/go.mod h1:RYkpo8pTHrNjW08opNd/U6p/RJE7K0D8fXO0d47+3YY=
github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
Expand Down
5 changes: 3 additions & 2 deletions pkg/kernel/kernel.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
package kernel

import (
"github.com/pkg/errors"
"io/ioutil"
"os"
"strings"
"time"
"unsafe"

"github.com/pkg/errors"

log "github.com/inconshreveable/log15"
"github.com/u-root/u-root/pkg/kexec"
"github.com/u-root/u-root/pkg/boot/kexec"
"golang.org/x/sys/unix"
"gopkg.in/yaml.v2"
)
Expand Down
5 changes: 3 additions & 2 deletions pkg/lldp/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ package lldp

import (
"fmt"
"net"
"time"

"github.com/google/gopacket"
"github.com/google/gopacket/layers"
"github.com/google/gopacket/pcap"
log "github.com/inconshreveable/log15"
"github.com/pkg/errors"
"net"
"time"
)

// LinkType can be Interface or Mac
Expand Down

0 comments on commit 4e6b4a8

Please sign in to comment.