Merge branch 'master' into OS-8525

Author: danmcd

CONTRIBUTING.md

@@ -0,0 +1,62 @@
+<!--
+    This Source Code Form is subject to the terms of the Mozilla Public
+    License, v. 2.0. If a copy of the MPL was not distributed with this
+    file, You can obtain one at http://mozilla.org/MPL/2.0/.
+-->
+
+<!--
+    Copyright 2019 Joyent, Inc.
+    Copyright 2024 MNX Cloud, Inc.
+-->
+
+# Triton Contribution Guidelines
+
+Thanks for using SmartOS and for considering contributing to it!
+
+## Code
+
+All changes to Triton project repositories go through code review via a GitHub
+pull request.
+
+If you're making a substantial change, you probably want to contact developers
+[on the mailing list or IRC](README.md#community) first. If you have any trouble
+with the contribution process, please feel free to contact developers [on the
+mailing list or IRC](README.md#community). Note that larger Triton project
+changes are typically designed and discussed via ["Requests for Discussion
+(RFDs)"](https://github.com/TritonDataCenter/rfd).
+
+SmartOS repositories use the [Triton Engineering
+Guidelines](https://github.com/TritonDataCenter/eng/blob/master/docs/index.md).
+Notably:
+
+* The #master or #main branch should be first-customer-ship (FCS) quality at all
+  times. Don't push anything until it's tested.
+* All repositories should be "make check" clean at all times.
+* All repositories should have tests that run cleanly at all times.
+
+## Issues
+
+There are two separate issue trackers that are relevant for SmartOS code:
+
+* An internal JIRA instance.
+
+  A JIRA ticket has an ID like `OS-7260`, where "OS" is the JIRA project
+  name -- in this case used by the
+  [smartos-live](https://github.com/TritonDataCenter/smartos-live) and related
+  repos. A read-only view of most JIRA tickets is made available at
+  <https://smartos.org/bugview/> (e.g.
+  <https://smartos.org/bugview/OS-7260>).
+* GitHub issues for the relevant repo, e.g.
+  <https://github.com/TritonDataCenter/smartos-ui/issues>.
+
+Before Triton was open sourced, Joyent engineering used a private JIRA instance.
+While we continue to use JIRA internally, we also use GitHub issues for
+tracking -- primarily to allow interaction with those without access to JIRA.
+
+## Code of Conduct
+
+All persons and/or organizations contributing to, or intercting with our
+repositories or communities are required to abide by the
+[illumos Code of Conduct][coc].
+
+[coc]: https://github.com/TritonDataCenter/illumos-joyent/blob/master/CODE_OF_CONDUCT.md

src/piadm.sh

@@ -206,6 +206,14 @@ config_check() {
 		return
 	fi
 
+        if grep -sq us-east.manta.joyent.com $PIADM_CONF ; then
+            # If they have a broken config with the stale joyent name,
+            # nuke it.
+            printf 'WARNING: Removing stale image server ' >&2
+            printf '(us-east.manta.joyent.com)\n' >&2
+            rm "${PIADM_CONF:?}"
+        fi
+
 	OLD_DEFAULT="$DEFAULT_URL_PREFIX"
 	if [[ -f $PIADM_CONF ]]; then
 		. $PIADM_CONF
@@ -220,7 +228,6 @@ config_check() {
 		PIADM_CONFIG_VERSION=1
 		cat <<EOF  > $PIADM_CONF
 PIADM_CONFIG_VERSION=$PIADM_CONFIG_VERSION
-DEFAULT_URL_PREFIX=$DEFAULT_URL_PREFIX
 EOF
 
 	fi
@@ -620,13 +627,15 @@ update_boot_sectors() {
 
 		# Use fstyp to confirm if this is a manually created EFI
 		# System Partition (ESP)
-		type=$(fstyp "/dev/dsk/${boot_devices[0]}s0")
+		type=$(fstyp "/dev/dsk/${boot_devices[0]}s0" 2>/dev/null)
 		if [[ "$type" == "pcfs" ]]; then
 			# If we detect PCFS on s0, it's LIKELY an EFI System
 			# Partition that was crafted manually.  Use s1 if it's
 			# ZFS, or bail if it's not.
 
-			s1type=$(fstyp "/dev/dsk/${boot_devices[0]}s1")
+			s1type=$(
+			    fstyp "/dev/dsk/${boot_devices[0]}s1" 2>/dev/null
+			)
 			if [[ "$s1type" != "zfs" ]]; then
 				fatal "Unusual configuration," \
 					"${boot_devices[0]}s1 not ZFS"