Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ exact code change can help focus discussions, so the choice is up to you.

## Setting up a development environment

Check out the [documentation](https://github.com/threefoldtech/zos4/tree/master/docs) learn about the code
base and setting up your [development environment](https://github.com/threefoldtech/zos4/blob/master/qemu/README.md).
Check out the [documentation](https://github.com/threefoldtech/zos_light/tree/master/docs) learn about the code
base and setting up your [development environment](https://github.com/threefoldtech/zos_light/blob/master/qemu/README.md).

## Pull requests

Expand Down Expand Up @@ -74,7 +74,7 @@ pull requests.

## Issues

[GitHub issues](https://github.com/threefoldtech/zos4/issues/new) can be used to report bugs or submit feature requests.
[GitHub issues](https://github.com/threefoldtech/zos_light/issues/new) can be used to report bugs or submit feature requests.

When reporting a bug please include the following key pieces of information:

Expand Down
2 changes: 1 addition & 1 deletion VALUES.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ values we hold as a team:
personally. Consider other people’s perspectives. Empathize with our users. Focus on the specific
issue at hand, and remember that we all care about the project, first and
foremost.
- [GitHub issues](https://github.com/threefoldtech/zos4/issues/new),
- [GitHub issues](https://github.com/threefoldtech/zos_light/issues/new),
document comments, or meetings are often better and higher bandwidth ways to
communicate complex and nuanced design issues, as opposed to protracted
heated live chats.
Expand Down
2 changes: 1 addition & 1 deletion cmds/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ OUT = $(shell realpath -m ../bin)
branch = $(shell git symbolic-ref -q --short HEAD || git describe --tags --exact-match)
revision = $(shell git rev-parse HEAD)
dirty = $(shell test -n "`git diff --shortstat 2> /dev/null | tail -n1`" && echo "*")
version = github.com/threefoldtech/zos4/pkg/version
version = github.com/threefoldtech/zos_light/pkg/version
ldflags = '-w -s -X $(version).Branch=$(branch) -X $(version).Revision=$(revision) -X $(version).Dirty=$(dirty) -extldflags "-static"'

all: identityd internet zos
Expand Down
24 changes: 12 additions & 12 deletions cmds/zos/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,20 +7,20 @@ import (

"github.com/rs/zerolog"
"github.com/rs/zerolog/log"
apigateway "github.com/threefoldtech/zos4/cmds/modules/api_gateway"
"github.com/threefoldtech/zos4/cmds/modules/contd"
"github.com/threefoldtech/zos4/cmds/modules/flistd"
"github.com/threefoldtech/zos4/cmds/modules/gateway"
"github.com/threefoldtech/zos4/cmds/modules/netlightd"
"github.com/threefoldtech/zos4/cmds/modules/noded"
"github.com/threefoldtech/zos4/cmds/modules/powerd"
"github.com/threefoldtech/zos4/cmds/modules/provisiond"
"github.com/threefoldtech/zos4/cmds/modules/storaged"
"github.com/threefoldtech/zos4/cmds/modules/vmd"
"github.com/threefoldtech/zos4/cmds/modules/zbusdebug"
"github.com/threefoldtech/zos4/cmds/modules/zui"
"github.com/threefoldtech/zos_base/pkg/app"
"github.com/threefoldtech/zos_base/pkg/version"
apigateway "github.com/threefoldtech/zos_light/cmds/modules/api_gateway"
"github.com/threefoldtech/zos_light/cmds/modules/contd"
"github.com/threefoldtech/zos_light/cmds/modules/flistd"
"github.com/threefoldtech/zos_light/cmds/modules/gateway"
"github.com/threefoldtech/zos_light/cmds/modules/netlightd"
"github.com/threefoldtech/zos_light/cmds/modules/noded"
"github.com/threefoldtech/zos_light/cmds/modules/powerd"
"github.com/threefoldtech/zos_light/cmds/modules/provisiond"
"github.com/threefoldtech/zos_light/cmds/modules/storaged"
"github.com/threefoldtech/zos_light/cmds/modules/vmd"
"github.com/threefoldtech/zos_light/cmds/modules/zbusdebug"
"github.com/threefoldtech/zos_light/cmds/modules/zui"
"github.com/urfave/cli/v2"
)

Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/threefoldtech/zos4
module github.com/threefoldtech/zos_light

go 1.25.0

Expand Down
2 changes: 1 addition & 1 deletion specs/upgrade.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ The purpose of this document is to discuss how zos should do the following:

## Current status is
- We have a single 0-OS image that is updated manually by triggering a new build whenever we feel like it
- The live-upgrading is done using upgraded ([see doc](https://github.com/threefoldtech/zos4/tree/master/docs/upgrade)) and we have a development version of the "upgrade server" at https://versions.dev.grid.tf. This server list all the available version and detail of the flist to use to apply the upgrade
- The live-upgrading is done using upgraded ([see doc](https://github.com/threefoldtech/zos_light/tree/master/docs/upgrade)) and we have a development version of the "upgrade server" at https://versions.dev.grid.tf. This server list all the available version and detail of the flist to use to apply the upgrade

Now with what we have at the moment there is already multiple issues:
1. there is no synchronization between the version publish for upgraded and the 0-OS images
Expand Down
Loading