mirrors/netboot
1
0
Fork 0
mirror of https://github.com/danderson/netboot.git synced 2025-10-17 18:41:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged pixicorev6 package into pixicore

Browse Source
This commit is contained in:
Dmitri Dolguikh 2018-01-04 13:15:58 -08:00 committed by Dave Anderson
parent 1ae9c3ab68
commit 8f56f51bbb
5 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pixiecorev6/boot_configuration.go → pixiecore/boot_configuration.go
View File

@ -1,4 +1,4 @@
package pixiecorev6 package pixiecore
import ( import (
"net/http" "net/http"

6
pixiecore/cli/bootipv6cmd.go
View File

@ -3,11 +3,11 @@ package cli
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"fmt" "fmt"
"go.universe.tf/netboot/pixiecorev6"
"go.universe.tf/netboot/dhcp6" "go.universe.tf/netboot/dhcp6"
"go.universe.tf/netboot/dhcp6/pool" "go.universe.tf/netboot/dhcp6/pool"
"net" "net"
"strings" "strings"
"go.universe.tf/netboot/pixiecore"
) )
// pixiecore bootipv6 --listen-addr=2001:db8:f00f:cafe::4/64 --httpboot-url=http://[2001:db8:f00f:cafe::4]/bootx64.efi --ipxe-url=http://[2001:db8:f00f:cafe::4]/script.ipxe // pixiecore bootipv6 --listen-addr=2001:db8:f00f:cafe::4/64 --httpboot-url=http://[2001:db8:f00f:cafe::4]/bootx64.efi --ipxe-url=http://[2001:db8:f00f:cafe::4]/script.ipxe
@ -28,7 +28,7 @@ var bootIPv6Cmd = &cobra.Command{
fatalf("Error reading flag: %s", err) fatalf("Error reading flag: %s", err)
} }
s := pixiecorev6.NewServerV6() s := pixiecore.NewServerV6()
s.Log = logWithStdFmt s.Log = logWithStdFmt
debug, err := cmd.Flags().GetBool("debug") debug, err := cmd.Flags().GetBool("debug")
@ -63,7 +63,7 @@ var bootIPv6Cmd = &cobra.Command{
dnsServerAddresses = append(dnsServerAddresses, net.ParseIP(dnsServerAddress)) dnsServerAddresses = append(dnsServerAddresses, net.ParseIP(dnsServerAddress))
} }
} }
s.BootConfig = pixiecorev6.MakeStaticBootConfiguration(httpBootURL, ipxeURL, preference, s.BootConfig = pixiecore.MakeStaticBootConfiguration(httpBootURL, ipxeURL, preference,
cmd.Flags().Changed("preference"), dnsServerAddresses) cmd.Flags().Changed("preference"), dnsServerAddresses)
addressPoolStart, err := cmd.Flags().GetString("address-pool-start") addressPoolStart, err := cmd.Flags().GetString("address-pool-start")

6
pixiecore/cli/ipv6apicmd.go
View File

@ -3,12 +3,12 @@ package cli
import ( import (
"github.com/spf13/cobra" "github.com/spf13/cobra"
"fmt" "fmt"
"go.universe.tf/netboot/pixiecorev6"
"go.universe.tf/netboot/dhcp6" "go.universe.tf/netboot/dhcp6"
"go.universe.tf/netboot/dhcp6/pool" "go.universe.tf/netboot/dhcp6/pool"
"time" "time"
"net" "net"
"strings" "strings"
"go.universe.tf/netboot/pixiecore"
) )
// pixiecore ipv6api --listen-addr=2001:db8:f00f:cafe::4 --api-request-url=http://[2001:db8:f00f:cafe::4]:8888 // pixiecore ipv6api --listen-addr=2001:db8:f00f:cafe::4 --api-request-url=http://[2001:db8:f00f:cafe::4]:8888
@ -30,7 +30,7 @@ var ipv6ApiCmd = &cobra.Command{
fatalf("Error reading flag: %s", err) fatalf("Error reading flag: %s", err)
} }
s := pixiecorev6.NewServerV6() s := pixiecore.NewServerV6()
s.Log = logWithStdFmt s.Log = logWithStdFmt
debug, err := cmd.Flags().GetBool("debug") debug, err := cmd.Flags().GetBool("debug")
if err != nil { if err != nil {
@ -60,7 +60,7 @@ var ipv6ApiCmd = &cobra.Command{
dnsServerAddresses = append(dnsServerAddresses, net.ParseIP(dnsServerAddress)) dnsServerAddresses = append(dnsServerAddresses, net.ParseIP(dnsServerAddress))
} }
} }
s.BootConfig = pixiecorev6.MakeAPIBootConfiguration(apiURL, apiTimeout, preference, s.BootConfig = pixiecore.MakeAPIBootConfiguration(apiURL, apiTimeout, preference,
cmd.Flags().Changed("preference"), dnsServerAddresses) cmd.Flags().Changed("preference"), dnsServerAddresses)
addressPoolStart, err := cmd.Flags().GetString("address-pool-start") addressPoolStart, err := cmd.Flags().GetString("address-pool-start")

2
pixiecorev6/dhcpv6.go → pixiecore/dhcpv6.go
View File

@ -1,4 +1,4 @@
package pixiecorev6 package pixiecore
import ( import (
"go.universe.tf/netboot/dhcp6" "go.universe.tf/netboot/dhcp6"

2
pixiecorev6/pixicorev6.go → pixiecore/pixicorev6.go
View File

@ -1,4 +1,4 @@
package pixiecorev6 package pixiecore
import ( import (
"go.universe.tf/netboot/dhcp6" "go.universe.tf/netboot/dhcp6"