Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OS-8370 Welcome MNX #1023

Merged
merged 2 commits into from
Apr 14, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
[submodule "deps/eng"]
path = deps/eng
url = https://github.com/joyent/eng.git
url = https://github.com/tritondatacenter/eng.git
2 changes: 1 addition & 1 deletion deps/eng
Submodule eng updated 58 files
+2 −2 .gitmodules
+12 −13 Makefile
+9 −3 README.md
+1 −1 deps/javascriptlint
+1 −1 deps/restdown
+242 −0 docs/hybridimages.md
+6 −8 docs/index.md
+1 −1 prototypes/prototype.Makefile
+1 −1 prototypes/prototype.bash
+1 −1 prototypes/prototype.c
+1 −1 prototypes/prototype.css
+1 −1 prototypes/prototype.d
+1 −1 prototypes/prototype.h
+1 −1 prototypes/prototype.js
+1 −1 prototypes/prototype.ksh
+1 −1 prototypes/prototype.md
+0 −15 prototypes/prototype.restdown
+1 −1 prototypes/prototype.rs
+1 −1 prototypes/prototype.sh
+0 −40 src/testctf.sh
+29 −12 tools/agent-prebuilt.sh
+3 −2 tools/bits-upload.sh
+19 −16 tools/buildimage/lib/imgadm/README.md
+0 −305 tools/buildimage/lib/imgadm/imgadm.patch
+19 −2 tools/buildimage/lib/imgadm/lib/cli.js
+1 −1 tools/buildimage/lib/imgadm/lib/common.js
+8 −2 tools/buildimage/lib/imgadm/lib/errors.js
+78 −6 tools/buildimage/lib/imgadm/lib/imgadm.js
+0 −177 tools/buildimage/lib/imgadm/lib/locker.js
+6 −0 tools/buildimage/lib/imgadm/lib/sources/imgapi.js
+11 −3 tools/buildimage/lib/imgadm/lib/sources/source.js
+3,105 −2,004 tools/buildimage/lib/imgadm/package-lock.json
+7 −7 tools/buildimage/lib/imgadm/package.json
+1 −1 tools/buildimage/lib/imgadm/sbin/imgadm
+37 −12 tools/check-copyright
+338 −0 tools/create-hybrid-image
+29 −21 tools/download_ctftools
+29 −9 tools/download_go
+21 −3 tools/mk/Makefile.agent_prebuilt.defs
+2 −1 tools/mk/Makefile.agent_prebuilt.targ
+10 −17 tools/mk/Makefile.ctf.defs
+5 −6 tools/mk/Makefile.ctf.targ
+18 −9 tools/mk/Makefile.defs
+9 −13 tools/mk/Makefile.deps
+3 −2 tools/mk/Makefile.go_prebuilt.defs
+9 −5 tools/mk/Makefile.go_prebuilt.targ
+2 −2 tools/mk/Makefile.manpages.defs
+2 −2 tools/mk/Makefile.manpages.targ
+2 −2 tools/mk/Makefile.node.defs
+2 −2 tools/mk/Makefile.node.targ
+2 −2 tools/mk/Makefile.node_modules.defs
+2 −2 tools/mk/Makefile.node_modules.targ
+9 −8 tools/mk/Makefile.node_prebuilt.defs
+4 −3 tools/mk/Makefile.node_prebuilt.targ
+2 −2 tools/mk/Makefile.smf.defs
+2 −2 tools/mk/Makefile.smf.targ
+61 −17 tools/mk/Makefile.targ
+45 −46 tools/validate-buildenv.sh
3 changes: 2 additions & 1 deletion src/smartdc/lib/smartos_prompt_config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@

#
# Copyright 2022 Joyent, Inc.
# Copyright 2022 MNX Cloud, Inc.
#

# XXX - TODO
Expand Down Expand Up @@ -1086,7 +1087,7 @@ export TERM=xterm-color

trap sig_doshell SIGINT

printheader "Joyent"
printheader "Triton SmartOS"

message="
You must answer the following questions to configure your SmartOS node.
Expand Down
3 changes: 2 additions & 1 deletion tools/build_etcrelease
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@

#
# Copyright 2019 Joyent, Inc.
# Copyright 2022 MNX Cloud, Inc.
#

#
Expand All @@ -29,7 +30,7 @@ ber_wsroot=$(cd "$(dirname "$0")/.." && pwd)
ber_first=true

ber_template=" SmartOS %%VERSION%% x86_64
Copyright %%YEAR%% Joyent, Inc.
Copyright %%YEAR%% MNX Cloud, Inc.

Built with the following components:
"
Expand Down