Skip to content

prepare for public release, add licence#136

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.

Sign up for GitHub

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

Merged
bcantrill merged 7 commits into from
Jan 29, 2024
Merged

prepare for public release, add licence #136

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e24aea0
XXX check for cargo with "gmake setup"
jclulow Jan 29, 2024
eb373ff
XXX initial pass of licence/copyright and minor style cleanup
jclulow Jan 29, 2024
603b825
XXX remove some vestigial and/or misleading bits
jclulow Jan 29, 2024
f8f6e98
XXX there is no external ip hack anymore
jclulow Jan 29, 2024
403dab5
XXX update/reduce deps
jclulow Jan 29, 2024
18c5066
XXX improved README, support for "gmake setup" without private repos
jclulow Jan 29, 2024
ff8c8fa
XXX rustfmt
jclulow Jan 29, 2024
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
373 changes: 373 additions & 0 deletions LICENSE
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 11 additions & 1 deletion Makefile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
exit 1; \
fi

.PHONY: cargocheck
cargocheck:
@if ! cargo --version >/dev/null 2>&1; then \
printf ' You must install Rust before continuing.\n' >&2; \
exit 1; \
fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
printf 'ERROR: must be built on illumos\n' >&2; \
exit 1; \
Expand Down
259 changes: 168 additions & 91 deletions README.md
View file
Open in desktop

Large diffs are not rendered by default.

54 changes: 37 additions & 17 deletions config/projects.toml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"
3 changes: 3 additions & 0 deletions image/mkcpio.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
3 changes: 3 additions & 0 deletions image/templates/files/bootparams.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
/name='/ && /type=string/ && /items=1/ {
Expand Down
3 changes: 3 additions & 0 deletions image/templates/files/compliance-beacon.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
83 changes: 43 additions & 40 deletions image/templates/files/compliance-beacon.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
<create_default_instance enabled='true' />

<!-- Wait for multi-user... -->
<dependency name='multi-user-server' grouping='require_all' restart_on='none'
type='service'>
<service_fmri value='svc:/milestone/multi-user-server' />
</dependency>

<!-- ... and make sure we run after the T6 has been configured. -->
<dependency name='t6init' grouping='require_all' restart_on='none'
type='service'>
<service_fmri value='svc:/system/t6init' />
</dependency>

<!-- ... and after our postboot script. -->
<dependency name='after-postboot' grouping='require_all' restart_on='none'
type='service'>
<service_fmri value='svc:/site/postboot' />
</dependency>

<exec_method type='method' name='start'
exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='child' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance multicast beacon</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sends multicast discovery announcements</loctext>
</description>
</template>
<create_default_instance enabled='true' />

<!-- Wait for multi-user... -->
<dependency name='multi-user-server' grouping='require_all'
restart_on='none' type='service'>
<service_fmri value='svc:/milestone/multi-user-server' />
</dependency>

<!-- ... and make sure we run after the T6 has been configured. -->
<dependency name='t6init' grouping='require_all' restart_on='none'
type='service'>
<service_fmri value='svc:/system/t6init' />
</dependency>

<!-- ... and after our postboot script. -->
<dependency name='after-postboot' grouping='require_all' restart_on='none'
type='service'>
<service_fmri value='svc:/site/postboot' />
</dependency>

<exec_method type='method' name='start'
exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='child' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance multicast beacon</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sends multicast discovery announcements
</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->
70 changes: 36 additions & 34 deletions image/templates/files/compliance-dump.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all' restart_on='none'
type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->
3 changes: 3 additions & 0 deletions image/templates/files/compliance-hostname.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
4 changes: 3 additions & 1 deletion image/templates/files/compliance-hostname.xml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->
3 changes: 3 additions & 0 deletions image/templates/files/compliance-postboot.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
prepare for public release, add licence by jclulow · Pull Request #136 · oxidecomputer/helios · GitHub
Skip to content
prepare for public release, add licence#136

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.

 Sign up for GitHub

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

 Merged

bcantrill
merged 7 commits into

from

Jan 29, 2024
 Merged


prepare for public release, add licence
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e24aea0

XXX check for cargo with "gmake setup"


jclulow Jan 29, 2024
eb373ff

XXX initial pass of licence/copyright and minor style cleanup


jclulow Jan 29, 2024
603b825

XXX remove some vestigial and/or misleading bits


jclulow Jan 29, 2024
f8f6e98

XXX there is no external ip hack anymore


jclulow Jan 29, 2024
403dab5

XXX update/reduce deps


jclulow Jan 29, 2024
18c5066

XXX improved README, support for "gmake setup" without private repos


jclulow Jan 29, 2024
ff8c8fa

XXX rustfmt


jclulow Jan 29, 2024

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


373 changes: 373 additions & 0 deletions
LICENSE

View file


Open in desktop


Large diffs are not rendered by default.


12 changes: 11 additions & 1 deletion
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
 exit 1; \
	fi

.PHONY: cargocheck
cargocheck:
	@if ! cargo --version >/dev/null 2>&1; then \
 printf ' You must install Rust before continuing.\n' >&2; \
 exit 1; \
	fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
	@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
	@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
 printf 'ERROR: must be built on illumos\n' >&2; \
 exit 1; \
Expand Down

259 changes: 168 additions & 91 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


54 changes: 37 additions & 17 deletions
config/projects.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"

3 changes: 3 additions & 0 deletions
image/mkcpio.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/bootparams.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
	/name='/ && /type=string/ && /items=1/ {
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-beacon.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

83 changes: 43 additions & 40 deletions
image/templates/files/compliance-beacon.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements</loctext>
 </description>
 </template>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all'
 restart_on='none' type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements
 </loctext>
 </description>
 </template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

70 changes: 36 additions & 34 deletions
image/templates/files/compliance-dump.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
 <create_default_instance enabled='false' />

 <!-- Wait for local file systems, like dumpadm does: -->
 <dependency name='local-filesystems' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/filesystem/local'/>
 </dependency>

 <!-- Hold dumpadm back until we've had a chance to look around: -->
 <dependent name='compliance-dump-dumpadm' restart_on='none'
 grouping='optional_all'>
 <service_fmri value='svc:/system/dumpadm'/>
 </dependent>

 <exec_method type='method' name='start'
 exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='transient' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
 </description>
 </template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
 restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-hostname.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

4 changes: 3 additions & 1 deletion
image/templates/files/compliance-hostname.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-postboot.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
prepare for public release, add licence by jclulow · Pull Request #136 · oxidecomputer/helios · GitHub
Skip to content
prepare for public release, add licence#136

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.

 Sign up for GitHub

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

 Merged

bcantrill
merged 7 commits into

from

Jan 29, 2024
 Merged


prepare for public release, add licence
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e24aea0

XXX check for cargo with "gmake setup"


jclulow Jan 29, 2024
eb373ff

XXX initial pass of licence/copyright and minor style cleanup


jclulow Jan 29, 2024
603b825

XXX remove some vestigial and/or misleading bits


jclulow Jan 29, 2024
f8f6e98

XXX there is no external ip hack anymore


jclulow Jan 29, 2024
403dab5

XXX update/reduce deps


jclulow Jan 29, 2024
18c5066

XXX improved README, support for "gmake setup" without private repos


jclulow Jan 29, 2024
ff8c8fa

XXX rustfmt


jclulow Jan 29, 2024

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


373 changes: 373 additions & 0 deletions
LICENSE

View file


Open in desktop


Large diffs are not rendered by default.


12 changes: 11 additions & 1 deletion
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
 exit 1; \
	fi

.PHONY: cargocheck
cargocheck:
	@if ! cargo --version >/dev/null 2>&1; then \
 printf ' You must install Rust before continuing.\n' >&2; \
 exit 1; \
	fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
	@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
	@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
 printf 'ERROR: must be built on illumos\n' >&2; \
 exit 1; \
Expand Down

259 changes: 168 additions & 91 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


54 changes: 37 additions & 17 deletions
config/projects.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"

3 changes: 3 additions & 0 deletions
image/mkcpio.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/bootparams.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
	/name='/ && /type=string/ && /items=1/ {
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-beacon.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

83 changes: 43 additions & 40 deletions
image/templates/files/compliance-beacon.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements</loctext>
 </description>
 </template>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all'
 restart_on='none' type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements
 </loctext>
 </description>
 </template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

70 changes: 36 additions & 34 deletions
image/templates/files/compliance-dump.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
 <create_default_instance enabled='false' />

 <!-- Wait for local file systems, like dumpadm does: -->
 <dependency name='local-filesystems' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/filesystem/local'/>
 </dependency>

 <!-- Hold dumpadm back until we've had a chance to look around: -->
 <dependent name='compliance-dump-dumpadm' restart_on='none'
 grouping='optional_all'>
 <service_fmri value='svc:/system/dumpadm'/>
 </dependent>

 <exec_method type='method' name='start'
 exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='transient' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
 </description>
 </template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
 restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-hostname.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

4 changes: 3 additions & 1 deletion
image/templates/files/compliance-hostname.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-postboot.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
prepare for public release, add licence by jclulow · Pull Request #136 · oxidecomputer/helios · GitHub
Skip to content
prepare for public release, add licence#136

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.

 Sign up for GitHub

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

 Merged

bcantrill
merged 7 commits into

from

Jan 29, 2024
 Merged


prepare for public release, add licence
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e24aea0

XXX check for cargo with "gmake setup"


jclulow Jan 29, 2024
eb373ff

XXX initial pass of licence/copyright and minor style cleanup


jclulow Jan 29, 2024
603b825

XXX remove some vestigial and/or misleading bits


jclulow Jan 29, 2024
f8f6e98

XXX there is no external ip hack anymore


jclulow Jan 29, 2024
403dab5

XXX update/reduce deps


jclulow Jan 29, 2024
18c5066

XXX improved README, support for "gmake setup" without private repos


jclulow Jan 29, 2024
ff8c8fa

XXX rustfmt


jclulow Jan 29, 2024

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


373 changes: 373 additions & 0 deletions
LICENSE

View file


Open in desktop


Large diffs are not rendered by default.


12 changes: 11 additions & 1 deletion
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
 exit 1; \
	fi

.PHONY: cargocheck
cargocheck:
	@if ! cargo --version >/dev/null 2>&1; then \
 printf ' You must install Rust before continuing.\n' >&2; \
 exit 1; \
	fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
	@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
	@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
 printf 'ERROR: must be built on illumos\n' >&2; \
 exit 1; \
Expand Down

259 changes: 168 additions & 91 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


54 changes: 37 additions & 17 deletions
config/projects.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"

3 changes: 3 additions & 0 deletions
image/mkcpio.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/bootparams.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
	/name='/ && /type=string/ && /items=1/ {
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-beacon.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

83 changes: 43 additions & 40 deletions
image/templates/files/compliance-beacon.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements</loctext>
 </description>
 </template>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all'
 restart_on='none' type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements
 </loctext>
 </description>
 </template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

70 changes: 36 additions & 34 deletions
image/templates/files/compliance-dump.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
 <create_default_instance enabled='false' />

 <!-- Wait for local file systems, like dumpadm does: -->
 <dependency name='local-filesystems' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/filesystem/local'/>
 </dependency>

 <!-- Hold dumpadm back until we've had a chance to look around: -->
 <dependent name='compliance-dump-dumpadm' restart_on='none'
 grouping='optional_all'>
 <service_fmri value='svc:/system/dumpadm'/>
 </dependent>

 <exec_method type='method' name='start'
 exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='transient' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
 </description>
 </template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
 restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-hostname.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

4 changes: 3 additions & 1 deletion
image/templates/files/compliance-hostname.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-postboot.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
prepare for public release, add licence by jclulow · Pull Request #136 · oxidecomputer/helios · GitHub
Skip to content
prepare for public release, add licence#136

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.

 Sign up for GitHub

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

 Merged

bcantrill
merged 7 commits into

from

Jan 29, 2024
 Merged


prepare for public release, add licence
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e24aea0

XXX check for cargo with "gmake setup"


jclulow Jan 29, 2024
eb373ff

XXX initial pass of licence/copyright and minor style cleanup


jclulow Jan 29, 2024
603b825

XXX remove some vestigial and/or misleading bits


jclulow Jan 29, 2024
f8f6e98

XXX there is no external ip hack anymore


jclulow Jan 29, 2024
403dab5

XXX update/reduce deps


jclulow Jan 29, 2024
18c5066

XXX improved README, support for "gmake setup" without private repos


jclulow Jan 29, 2024
ff8c8fa

XXX rustfmt


jclulow Jan 29, 2024

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


373 changes: 373 additions & 0 deletions
LICENSE

View file


Open in desktop


Large diffs are not rendered by default.


12 changes: 11 additions & 1 deletion
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
 exit 1; \
	fi

.PHONY: cargocheck
cargocheck:
	@if ! cargo --version >/dev/null 2>&1; then \
 printf ' You must install Rust before continuing.\n' >&2; \
 exit 1; \
	fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
	@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
	@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
 printf 'ERROR: must be built on illumos\n' >&2; \
 exit 1; \
Expand Down

259 changes: 168 additions & 91 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


54 changes: 37 additions & 17 deletions
config/projects.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"

3 changes: 3 additions & 0 deletions
image/mkcpio.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/bootparams.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
	/name='/ && /type=string/ && /items=1/ {
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-beacon.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

83 changes: 43 additions & 40 deletions
image/templates/files/compliance-beacon.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements</loctext>
 </description>
 </template>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all'
 restart_on='none' type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements
 </loctext>
 </description>
 </template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

70 changes: 36 additions & 34 deletions
image/templates/files/compliance-dump.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
 <create_default_instance enabled='false' />

 <!-- Wait for local file systems, like dumpadm does: -->
 <dependency name='local-filesystems' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/filesystem/local'/>
 </dependency>

 <!-- Hold dumpadm back until we've had a chance to look around: -->
 <dependent name='compliance-dump-dumpadm' restart_on='none'
 grouping='optional_all'>
 <service_fmri value='svc:/system/dumpadm'/>
 </dependent>

 <exec_method type='method' name='start'
 exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='transient' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
 </description>
 </template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
 restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-hostname.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

4 changes: 3 additions & 1 deletion
image/templates/files/compliance-hostname.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-postboot.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
prepare for public release, add licence by jclulow · Pull Request #136 · oxidecomputer/helios · GitHub
Skip to content
prepare for public release, add licence#136

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.

 Sign up for GitHub

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

 Merged

bcantrill
merged 7 commits into

from

Jan 29, 2024
 Merged


prepare for public release, add licence
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e24aea0

XXX check for cargo with "gmake setup"


jclulow Jan 29, 2024
eb373ff

XXX initial pass of licence/copyright and minor style cleanup


jclulow Jan 29, 2024
603b825

XXX remove some vestigial and/or misleading bits


jclulow Jan 29, 2024
f8f6e98

XXX there is no external ip hack anymore


jclulow Jan 29, 2024
403dab5

XXX update/reduce deps


jclulow Jan 29, 2024
18c5066

XXX improved README, support for "gmake setup" without private repos


jclulow Jan 29, 2024
ff8c8fa

XXX rustfmt


jclulow Jan 29, 2024

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


373 changes: 373 additions & 0 deletions
LICENSE

View file


Open in desktop


Large diffs are not rendered by default.


12 changes: 11 additions & 1 deletion
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
 exit 1; \
	fi

.PHONY: cargocheck
cargocheck:
	@if ! cargo --version >/dev/null 2>&1; then \
 printf ' You must install Rust before continuing.\n' >&2; \
 exit 1; \
	fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
	@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
	@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
 printf 'ERROR: must be built on illumos\n' >&2; \
 exit 1; \
Expand Down

259 changes: 168 additions & 91 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


54 changes: 37 additions & 17 deletions
config/projects.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"

3 changes: 3 additions & 0 deletions
image/mkcpio.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/bootparams.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
	/name='/ && /type=string/ && /items=1/ {
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-beacon.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

83 changes: 43 additions & 40 deletions
image/templates/files/compliance-beacon.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements</loctext>
 </description>
 </template>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all'
 restart_on='none' type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements
 </loctext>
 </description>
 </template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

70 changes: 36 additions & 34 deletions
image/templates/files/compliance-dump.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
 <create_default_instance enabled='false' />

 <!-- Wait for local file systems, like dumpadm does: -->
 <dependency name='local-filesystems' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/filesystem/local'/>
 </dependency>

 <!-- Hold dumpadm back until we've had a chance to look around: -->
 <dependent name='compliance-dump-dumpadm' restart_on='none'
 grouping='optional_all'>
 <service_fmri value='svc:/system/dumpadm'/>
 </dependent>

 <exec_method type='method' name='start'
 exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='transient' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
 </description>
 </template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
 restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-hostname.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

4 changes: 3 additions & 1 deletion
image/templates/files/compliance-hostname.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-postboot.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
prepare for public release, add licence by jclulow · Pull Request #136 · oxidecomputer/helios · GitHub
Skip to content
prepare for public release, add licence#136

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.

 Sign up for GitHub

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

 Merged

bcantrill
merged 7 commits into

from

Jan 29, 2024
 Merged


prepare for public release, add licence
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e24aea0

XXX check for cargo with "gmake setup"


jclulow Jan 29, 2024
eb373ff

XXX initial pass of licence/copyright and minor style cleanup


jclulow Jan 29, 2024
603b825

XXX remove some vestigial and/or misleading bits


jclulow Jan 29, 2024
f8f6e98

XXX there is no external ip hack anymore


jclulow Jan 29, 2024
403dab5

XXX update/reduce deps


jclulow Jan 29, 2024
18c5066

XXX improved README, support for "gmake setup" without private repos


jclulow Jan 29, 2024
ff8c8fa

XXX rustfmt


jclulow Jan 29, 2024

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


373 changes: 373 additions & 0 deletions
LICENSE

View file


Open in desktop


Large diffs are not rendered by default.


12 changes: 11 additions & 1 deletion
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
 exit 1; \
	fi

.PHONY: cargocheck
cargocheck:
	@if ! cargo --version >/dev/null 2>&1; then \
 printf ' You must install Rust before continuing.\n' >&2; \
 exit 1; \
	fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
	@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
	@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
 printf 'ERROR: must be built on illumos\n' >&2; \
 exit 1; \
Expand Down

259 changes: 168 additions & 91 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


54 changes: 37 additions & 17 deletions
config/projects.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"

3 changes: 3 additions & 0 deletions
image/mkcpio.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/bootparams.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
	/name='/ && /type=string/ && /items=1/ {
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-beacon.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

83 changes: 43 additions & 40 deletions
image/templates/files/compliance-beacon.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements</loctext>
 </description>
 </template>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all'
 restart_on='none' type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements
 </loctext>
 </description>
 </template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

70 changes: 36 additions & 34 deletions
image/templates/files/compliance-dump.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
 <create_default_instance enabled='false' />

 <!-- Wait for local file systems, like dumpadm does: -->
 <dependency name='local-filesystems' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/filesystem/local'/>
 </dependency>

 <!-- Hold dumpadm back until we've had a chance to look around: -->
 <dependent name='compliance-dump-dumpadm' restart_on='none'
 grouping='optional_all'>
 <service_fmri value='svc:/system/dumpadm'/>
 </dependent>

 <exec_method type='method' name='start'
 exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='transient' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
 </description>
 </template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
 restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-hostname.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

4 changes: 3 additions & 1 deletion
image/templates/files/compliance-hostname.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-postboot.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
prepare for public release, add licence by jclulow · Pull Request #136 · oxidecomputer/helios · GitHub
Skip to content
prepare for public release, add licence#136

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.

 Sign up for GitHub

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

 Merged

bcantrill
merged 7 commits into

from

Jan 29, 2024
 Merged


prepare for public release, add licence
#136
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
e24aea0

XXX check for cargo with "gmake setup"


jclulow Jan 29, 2024
eb373ff

XXX initial pass of licence/copyright and minor style cleanup


jclulow Jan 29, 2024
603b825

XXX remove some vestigial and/or misleading bits


jclulow Jan 29, 2024
f8f6e98

XXX there is no external ip hack anymore


jclulow Jan 29, 2024
403dab5

XXX update/reduce deps


jclulow Jan 29, 2024
18c5066

XXX improved README, support for "gmake setup" without private repos


jclulow Jan 29, 2024
ff8c8fa

XXX rustfmt


jclulow Jan 29, 2024

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


373 changes: 373 additions & 0 deletions
LICENSE

View file


Open in desktop


Large diffs are not rendered by default.


12 changes: 11 additions & 1 deletion
Makefile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
#
# Copyright 2024 Oxide Computer Company
#

TOP = $(PWD)

Expand All@@ -23,6 +26,13 @@ gmakecheck:
 exit 1; \
	fi

.PHONY: cargocheck
cargocheck:
	@if ! cargo --version >/dev/null 2>&1; then \
 printf ' You must install Rust before continuing.\n' >&2; \
 exit 1; \
	fi

#
# Run a "quick" build of illumos for development:
#
Expand All@@ -47,7 +57,7 @@ setup: gmakecheck $(HELIOS_BUILD)
	@printf '\n'

.PHONY: $(HELIOS_BUILD)
$(HELIOS_BUILD):
$(HELIOS_BUILD): cargocheck
	@if [[ $$(/usr/bin/uname -o) != illumos ]]; then \
 printf 'ERROR: must be built on illumos\n' >&2; \
 exit 1; \
Expand Down

259 changes: 168 additions & 91 deletions
README.md

View file


Open in desktop


Large diffs are not rendered by default.


54 changes: 37 additions & 17 deletions
config/projects.toml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,18 +1,24 @@
#
# Copyright 2024 Oxide Computer Company
#

[project.illumos]
github = "oxidecomputer/illumos-gate"
rev = "stlouis"
unless_env = "BUILD_OS"

[project.omnios-build]
github = "oxidecomputer/helios-omnios-build"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.omnios-extra]
github = "oxidecomputer/helios-omnios-extra"
rev = "helios2"
unless_env = "BUILD_OS"
use_ssh = true
use_ssh = false
site_sh = true

[project.pinprick]
Expand All@@ -22,14 +28,38 @@ cargo_build = true

[project.phbl]
github = "oxidecomputer/phbl"
use_ssh = true
use_ssh = false

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = false
cargo_build = true
auto_update = true

#
# -----------------------------------------------------------------------------
# NOTE: Repositories below this comment are all still private.
#
# If you do not have access to private repositories in the "oxidecomputer"
# GitHub organisation, set "OXIDE_STAFF=no" in your environment to skip
# cloning them.
# -----------------------------------------------------------------------------
#

[project.amd-host-image-builder]
github = "oxidecomputer/amd-host-image-builder"
use_ssh = true
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[[project.amd-host-image-builder.fixup]]
#
Expand All@@ -43,28 +73,18 @@ to_branch = "main"
github = "oxidecomputer/amd-firmware"
use_ssh = true
auto_update = true

[project.bootserver]
github = "oxidecomputer/boot-image-tools"
use_ssh = true
cargo_build = true
auto_update = true

[project.image-builder]
github = "illumos/image-builder"
use_ssh = false
cargo_build = true
use_debug = true
auto_update = true
unless_env = "OXIDE_STAFF"

[project.chelsio-t6-roms]
github = "oxidecomputer/chelsio-t6-roms"
use_ssh = true
cargo_build = false
auto_update = true
unless_env = "OXIDE_STAFF"

[project.pilot]
github = "oxidecomputer/compliance-pilot"
github = "oxidecomputer/pilot"
use_ssh = true
cargo_build = true
auto_update = true
unless_env = "OXIDE_STAFF"

3 changes: 3 additions & 0 deletions
image/mkcpio.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/bootparams.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

prtconf -v /devices | awk -v want="$1" "
	/name='/ && /type=string/ && /items=1/ {
Expand Down

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-beacon.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

83 changes: 43 additions & 40 deletions
image/templates/files/compliance-beacon.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,49 +1,52 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-beacon'>

<service name='site/compliance/beacon' type='service' version='1'>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements</loctext>
 </description>
 </template>
 <create_default_instance enabled='true' />

 <!-- Wait for multi-user... -->
 <dependency name='multi-user-server' grouping='require_all'
 restart_on='none' type='service'>
 <service_fmri value='svc:/milestone/multi-user-server' />
 </dependency>

 <!-- ... and make sure we run after the T6 has been configured. -->
 <dependency name='t6init' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/t6init' />
 </dependency>

 <!-- ... and after our postboot script. -->
 <dependency name='after-postboot' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/site/postboot' />
 </dependency>

 <exec_method type='method' name='start'
 exec='/usr/lib/compliance-beacon' timeout_seconds='30' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='child' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance multicast beacon</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sends multicast discovery announcements
 </loctext>
 </description>
 </template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

70 changes: 36 additions & 34 deletions
image/templates/files/compliance-dump.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-dump'>

<service name='site/compliance/dump' type='service' version='1'>
 <create_default_instance enabled='false' />

 <!-- Wait for local file systems, like dumpadm does: -->
 <dependency name='local-filesystems' grouping='require_all' restart_on='none'
 type='service'>
 <service_fmri value='svc:/system/filesystem/local'/>
 </dependency>

 <!-- Hold dumpadm back until we've had a chance to look around: -->
 <dependent name='compliance-dump-dumpadm' restart_on='none'
 grouping='optional_all'>
 <service_fmri value='svc:/system/dumpadm'/>
 </dependent>

 <exec_method type='method' name='start'
 exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

 <exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

 <property_group name='startd' type='framework'>
 <propval name='duration' type='astring' value='transient' />
 </property_group>

 <stability value='Unstable' />

 <template>
 <common_name>
 <loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
 </common_name>
 <description>
 <loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
 </description>
 </template>
<create_default_instance enabled='false' />

<!-- Wait for local file systems, like dumpadm does: -->
<dependency name='local-filesystems' grouping='require_all'
 restart_on='none' type='service'>
<service_fmri value='svc:/system/filesystem/local'/>
</dependency>

<!-- Hold dumpadm back until we've had a chance to look around: -->
<dependent name='compliance-dump-dumpadm' restart_on='none'
grouping='optional_all'>
<service_fmri value='svc:/system/dumpadm'/>
</dependent>

<exec_method type='method' name='start'
exec='/usr/bin/pilot gimlet dump setup' timeout_seconds='600' />

<exec_method type='method' name='stop' exec=':kill' timeout_seconds='30' />

<property_group name='startd' type='framework'>
<propval name='duration' type='astring' value='transient' />
</property_group>

<stability value='Unstable' />

<template>
<common_name>
<loctext xml:lang='C'>compliance ad hoc dump setup</loctext>
</common_name>
<description>
<loctext xml:lang='C'>sets up a ZFS pool and dump device</loctext>
</description>
</template>
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-hostname.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down

4 changes: 3 additions & 1 deletion
image/templates/files/compliance-hostname.xml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE service_bundle SYSTEM "/usr/share/lib/xml/dtd/service_bundle.dtd.1">
<!--
 Copyright 2024 Oxide Computer Company
-->

<service_bundle type='manifest' name='site-compliance-hostname'>

Expand DownExpand Up@@ -45,4 +48,3 @@
</service>

</service_bundle>
<!-- vim: set ts=2 sts=2 sw=2 et: -->

3 changes: 3 additions & 0 deletions
image/templates/files/compliance-postboot.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,7 @@
#!/bin/bash
#
# Copyright 2024 Oxide Computer Company
#

set -o errexit
set -o pipefail
Expand Down
Loading