diff options
| author | Dan McDonald <danmcd@joyent.com> | 2021-08-18 11:32:58 -0400 |
|---|---|---|
| committer | Dan McDonald <danmcd@joyent.com> | 2021-08-18 11:32:58 -0400 |
| commit | 7592d4373f888df2586fe68fed485e6911bc1bed (patch) | |
| tree | b01a0b0779f9fc0c1f459020bc2dee9655ec42bc /usr/src/tools | |
| parent | f3fe11ae4095c266424f0708a6bd1672584fa999 (diff) | |
| parent | 4772ec9f4bc326d705888dcda49bcc395df74999 (diff) | |
| download | illumos-joyent-7592d4373f888df2586fe68fed485e6911bc1bed.tar.gz | |
[illumos-gate merge]
commit 4772ec9f4bc326d705888dcda49bcc395df74999
13983 onu could support updating on Helios
commit 998cfd7bd13f4dffec51769e903ceec265afce6f
13988 libproc leaks zoneroot
commit 9148a91fab5cca2666b01bab18514159f4480f9e
13989 libproc can leak core CTF data
commit 50d4d24e9f62b588d2123e06f654ecb230e4857c
13987 libproc could use standard lists
Conflicts:
manifest
Diffstat (limited to 'usr/src/tools')
| -rw-r--r-- | usr/src/tools/scripts/onu.sh.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/tools/scripts/onu.sh.in b/usr/src/tools/scripts/onu.sh.in index c461dfcf11..fb77577de8 100644 --- a/usr/src/tools/scripts/onu.sh.in +++ b/usr/src/tools/scripts/onu.sh.in @@ -104,7 +104,7 @@ prepare_image() print "**\n** Preparing for ONU from $distribution\n**" case $distribution in - omnios) + omnios|helios) # This removes files from the image that cause conflicts with # stock illumos-gate, and removes omnios-only kernel drivers # etc. @@ -162,7 +162,7 @@ case $distribution in openindiana) nlbrand=nlipkg ;; - omnios) + omnios|helios) nlbrand=ipkg ;; *) |