Merge branch 'master' into OS-7458

Author: danmcd

CONTRIBUTING.md

@@ -6,7 +6,7 @@
 
 <!--
     Copyright 2019 Joyent, Inc.
-    Copyright 2024 MNX Cloud, Inc.
+    Copyright 2025 MNX Cloud, Inc.
 -->
 
 # Triton Contribution Guidelines
@@ -55,7 +55,7 @@ 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
+All persons and/or organizations contributing to, or interacting with our
 repositories or communities are required to abide by the
 [illumos Code of Conduct][coc].
 

Jenkinsfile

@@ -6,7 +6,7 @@
 
 /*
  * Copyright 2022 Joyent, Inc.
- * Copyright 2023 MNX Cloud, Inc.
+ * Copyright 2024 MNX Cloud, Inc.
  */
 
 @Library('[email protected]') _
@@ -45,8 +45,8 @@ pipeline {
                 '<dd>platform root password [default: randomly chosen]</dd>\n' +
                 '<dt>-S</dt>\n' +
                 '<dd>do *not* run smatch [default is to run smatch]</dd>\n' +
-                '<dt>-s gcc7</dt>\n' +
-                '<dd>shadow compilers, comma delimited (gcc7,gcc#) [default: none]</dd>\n' +
+                '<dt>-s gcc14</dt>\n' +
+                '<dd>shadow compilers, comma delimited (gcc14,gcc#) [default: none]</dd>\n' +
                 '</dl>'
         )
         text(
@@ -250,12 +250,12 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
                     }
                 }
             }
-            stage('gcc7') {
+            stage('gcc14') {
                 agent {
                     node {
                         label 'platform:true && image_ver:21.4.0 && pkgsrc_arch:x86_64 && ' +
                             'dram:16gb && !virt:kvm && fs:pcfs && fs:ufs && jenkins_agent:3'
-                        customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc7"
+                        customWorkspace "workspace/smartos-${BRANCH_NAME}-gcc14"
                     }
                 }
                 when {
@@ -272,18 +272,18 @@ export PLAT_CONFIGURE_ARGS="-d $PLAT_CONFIGURE_ARGS"
                 steps {
                     sh('git clean -fdx')
                     sh('''
-export PLAT_CONFIGURE_ARGS="-p gcc7 -r $PLAT_CONFIGURE_ARGS"
+export PLAT_CONFIGURE_ARGS="-p gcc14 -r $PLAT_CONFIGURE_ARGS"
 # enough to make sure we don't pollute the main Manta dir
-# Also for now we implicitly promise that the gcc7 deliverables are DEBUG,
-# but we could choose to make -gcc7 *and* -debug-gcc7 stages later and alter
+# Also for now we implicitly promise that the gcc14 deliverables are DEBUG,
+# but we could choose to make -gcc14 *and* -debug-gcc14 stages later and alter
 # PLATFORM_DEBUG_SUFFIX accordingly.
-export PLATFORM_DEBUG_SUFFIX=-gcc7
-./tools/build_jenkins -c -d -S gcc7
+export PLATFORM_DEBUG_SUFFIX=-gcc14
+./tools/build_jenkins -c -d -S gcc14
                     ''')
                 }
                 post {
                     always {
-                        archiveArtifacts artifacts: 'output/gcc7/**',
+                        archiveArtifacts artifacts: 'output/gcc14/**',
                             onlyIfSuccessful: false,
                             allowEmptyArchive: true
                         cleanWs cleanWhenSuccess: true,
@@ -292,7 +292,7 @@ export PLATFORM_DEBUG_SUFFIX=-gcc7
                             cleanWhenNotBuilt: true,
                             deleteDirs: true
                         joySlackNotifications(
-                            channel: 'smartos', comment: 'gcc7')
+                            channel: 'smartos', comment: 'gcc14')
                     }
                 }
             }

configure

@@ -414,7 +414,7 @@ AR=/usr/bin/ar;					export AR
 if [[ -z "\$MAKE" ]]; then
 MAKE="\$SRC/tools/proto/root_i386-nd/opt/onbld/bin/i386/dmake";	export MAKE
 fi
-LEX=/opt/local/bin/lex;				export LEX
+# As of illumos#16873, we no longer need to define LEX, as it's in tools.
 # As of illumos#16319, we no longer need to define YACC, as it's in tools.
 BISON=/opt/local/bin/bison;			export BISON
 GM4=/opt/local/bin/gm4;				export GM4

man/smartdc/man/man1/sdc-factoryreset.1.md

@@ -3,31 +3,41 @@
 
 ## SYNOPSIS
 
-`sdc-factoryreset [-h | --help]`
+`sdc-factoryreset [-h | --help] {-s}`
 
 
 ## DESCRIPTION
 
 This command resets a machine to its originally installed state.  Specifically,
 it reboots the machine, imports all ZFS pools, and destroys them individually.
-It does this by setting a ZFS user property on the system pool.
+It does this by setting a ZFS user property on the system pool. Using the
+`-s` flag will instead shut down the machine; putting it into a state where
+upon next reboot, the machine will import all ZFS pool and destroy them
+individually.
 
 If this command is invoked unintentionally, an administrator can prevent the
-system from resetting itself by booting in rescue mode (noimport=true as a GRUB
+system from resetting itself by booting in rescue mode (noimport=true as a
 boot option) and clearing the smartdc:factoryreset property from the var
-dataset.  If the system is booting without the noimport=true GRUB option, the
-only way to stop the pending factory reset is to power cycle the machine, and
-boot again into rescue mode.  The service which does the actual factory reset
-starts well before an administrator would be able to login to the box, even if
-that administrator has console access.
+dataset.  Use of the `-s` option makes this easier to accomplish.
+
+If the affected system boots without the noimport=true option, the only way
+to stop the pending factory reset is to power cycle the machine, and boot
+again into rescue mode.  The service which does the actual factory reset
+starts well before an administrator would be able to login to the box, even
+if that administrator has console access.
 
 
 ## OPTIONS
 
 `-h`
     Show the help and usage mesage
 
+`-s`
+    Instead of immediately rebooting, shut down the machine instead
+    (using poweroff(8)).
+
 
 ## COPYRIGHT
 
-sdc-factoryreset Copyright (c) 2014, Joyent, Inc.
+Copyright (c) 2014, Joyent, Inc.
+Copyright 2024 MNX Cloud, Inc.

src/smartdc/bin/sdc-factoryreset.sh

@@ -7,6 +7,7 @@
 
 #
 # Copyright (c) 2014, Joyent, Inc.
+# Copyright 2024 MNX Cloud, Inc.
 #
 
 #
@@ -27,7 +28,7 @@ function abort()
 
 function usage()
 {
-	printf "\nUsage: $myname [-h | --help]\n\n"
+	printf "\nUsage: $myname [-h | --help] {-s}\n\n"
 	printf "Resets a machine to its originally installed state.  See "
 	printf "sdc-factoryreset(1)\nfor more information.\n"
 	exit 1
@@ -37,18 +38,22 @@ if [[ -n $1 ]] && [[ $1 = "--help" ]]; then
 	usage
 fi
 
-while getopts "h" opt
+final_command="reboot"
+final_verb="Rebooting"
+
+while getopts "hs" opt
 do
 	case "$opt" in
 		h)	usage;;
+		s)	final_command="poweroff"; final_verb="Powering off";;
 		*)	usage;;
 	esac
 done
 
 trap abort SIGINT
 
-printf "WARNING: This machine will reboot and destroy its ZFS pools after "
-printf "rebooting.\n"
+printf "WARNING: This machine will $final_command and destroy its ZFS pools "
+printf "during the next boot.\n"
 
 read -p "Do you want to proceed with the factory reset? (y/n) " -n 1
 
@@ -59,15 +64,15 @@ if [[ $REPLY =~ ^[Yy]$ ]]; then
 	read -p "Are you sure? (y/n) " -n 1
 
 	if [[ $REPLY =~ ^[Yy]$ ]]; then
-		printf "\n\nRebooting in 5 seconds ... "
+		printf "\n\n$final_verb in 5 seconds ... "
 		sleep 5
 		printf "now!\n"
 
 		SYS_ZPOOL=$(svcprop -p config/zpool smartdc/init)
 		[[ -n ${SYS_ZPOOL} ]] || SYS_ZPOOL=zones
 
 		zfs set smartdc:factoryreset=yes ${SYS_ZPOOL}/var
-		reboot
+		$final_command
 	else
 		abort
 	fi

src/smartdc/lib/smartos_prompt_config.sh

@@ -1069,6 +1069,8 @@ elif [[ -f ${USBMNT}/private/answers.json ]]; then
 	answer_file=${USBMNT}/private/answers.json
 elif [[ -f ${USBMOUNTPOINT}/private/answers.json ]]; then
 	answer_file=${USBMOUNTPOINT}/private/answers.json
+elif [[ -f /system/boot/answers.json ]]; then
+	answer_file=/system/boot/answers.json
 fi
 
 #

tools/generate-manifest-from-ips.nawk

@@ -8,6 +8,7 @@
 
 #
 # Copyright 2019 Joyent, Inc.
+# Copyright 2025 MNX Cloud, Inc.
 #
 
 #
@@ -128,13 +129,23 @@ function emit_line() {
 
     if (action_name == "file" || action_name == "dir") {
         print name " " replace_macros(attrs["path"]) " " mode " " owner " " group;
-    } else if (action_name == "link" || action_name == "hardlink") {
+    } else if (action_name == "link") {
+	#
+	# SmartOS manifests expect the literal value of a symbolic
+	# link target.  Unlike hard links, we need to scribble in
+	# something that can cope with relative paths either in the
+	# proto area or in the actual filesystem. Take IPS at its word
+	# for symbolic links.
+	#
+	print name " " replace_macros(attrs["path"]) "=" replace_macros(attrs["target"]);
+    } else if (action_name == "hardlink") {
 
         #
-        # SmartOS manifests expect full paths in targets, but IPS manifests
-        # don't require that. Try to catch these cases by looking for link
-        # targets that are either relative, or contain no directory
-        # separators, and prepend the parent directory of the source path.
+        # SmartOS manifests expect full paths in targets for hard
+        # links, but IPS manifests don't require that. Try to catch
+        # these cases by looking for link targets that are either
+        # relative, or contain no directory separators, and prepend
+        # the parent directory of the source path.
         #
         if (match(attrs["target"], "^\.") != 0 || match(attrs["target"], "/") == 0) {
             split(attrs["path"], path_comps, "/");