Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177741342
D61742.1795175473.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
3 KB
Referenced Files
None
Subscribers
None
D61742.1795175473.diff
View Options
diff --git a/usr.sbin/sysrc/sysrc b/usr.sbin/sysrc/sysrc
--- a/usr.sbin/sysrc/sysrc
+++ b/usr.sbin/sysrc/sysrc
@@ -16,7 +16,7 @@
#
# Version information
#
-SYSRC_VERSION="9.1 Nov-18,2026"
+SYSRC_VERSION="9.2 Nov-18,2026"
#
# Options
@@ -906,6 +906,31 @@
continue
fi
+ # Empty append or remove changes nothing
+ case "$mode:$1" in
+ LISTAPPEND:*=|LISTREMOVE:*=|STRAPPEND:*=)
+ if [ "$SHOW_EQUALS" ]; then
+ shell_fmt "$name=%s # unchanged\n" "$before"
+ else
+ echo "$name$SEP$before (unchanged)"
+ fi
+ shift 1
+ continue ;;
+ esac
+
+ # An unset name is not already NULL
+ if [ "$before" = "$new" ] &&
+ IGNORED=$( f_sysrc_get "$NAME?" )
+ then
+ if [ "$SHOW_EQUALS" ]; then
+ shell_fmt "$name=%s # unchanged\n" "$before"
+ else
+ echo "$name$SEP$before (unchanged)"
+ fi
+ shift 1
+ continue
+ fi
+
#
# If `-N' is passed, simplify the output
#
diff --git a/usr.sbin/sysrc/tests/sysrc_test.sh b/usr.sbin/sysrc/tests/sysrc_test.sh
--- a/usr.sbin/sysrc/tests/sysrc_test.sh
+++ b/usr.sbin/sysrc/tests/sysrc_test.sh
@@ -44,7 +44,7 @@
sysrc -f "${SYSRC_CONF}" test_enable=YES
atf_check -o inline:'test_enable="YES"\n' cat "${SYSRC_CONF}"
# Change set variable
- atf_check -o inline:"test_enable: YES -> YES\n" \
+ atf_check -o inline:"test_enable: YES (unchanged)\n" \
sysrc -f "${SYSRC_CONF}" test_enable=YES
atf_check -o inline:'test_enable="YES"\n' cat "${SYSRC_CONF}"
atf_check -o inline:"test_enable: YES -> NO\n" \
@@ -55,6 +55,11 @@
sysrc -f "${SYSRC_CONF}" test2_enable=""
atf_check -o inline:'test_enable="NO"\ntest2_enable=""\n' \
cat "${SYSRC_CONF}"
+ # Already NULL
+ atf_check -o inline:"test2_enable: (unchanged)\n" \
+ sysrc -f "${SYSRC_CONF}" test2_enable=""
+ atf_check -o inline:'test_enable="NO"\ntest2_enable=""\n' \
+ cat "${SYSRC_CONF}"
}
atf_test_case remove_variable_x_flag
@@ -89,7 +94,7 @@
atf_check -o inline:"test_list: -> item1\n" \
sysrc -f "${SYSRC_CONF}" test_list+=item1
atf_check -o inline:'test_list="item1"\n' cat "${SYSRC_CONF}"
- atf_check -o inline:"test_list: item1 -> item1\n" \
+ atf_check -o inline:"test_list: item1 (unchanged)\n" \
sysrc -f "${SYSRC_CONF}" test_list+=item1
atf_check -o inline:'test_list="item1"\n' cat "${SYSRC_CONF}"
atf_check -o inline:"test_list: item1 -> item1 item2\n" \
@@ -113,7 +118,7 @@
atf_check -o inline:"test_list: item1 -> \n" \
sysrc -f "${SYSRC_CONF}" test_list-=item1
atf_check -o inline:'test_list=""\n' cat "${SYSRC_CONF}"
- atf_check -o inline:"test_list: -> \n" \
+ atf_check -o inline:"test_list: (unchanged)\n" \
sysrc -f "${SYSRC_CONF}" test_list-=item3
atf_check -o inline:'test_list=""\n' cat "${SYSRC_CONF}"
@@ -416,8 +421,7 @@
cat "${SYSRC_CONF}"
# Appending a token already present does not duplicate it
- msg="test_flags: \$test_flags -J 16 extra ->"
- msg="$msg \$test_flags -J 16 extra"
+ msg="test_flags: \$test_flags -J 16 extra (unchanged)"
atf_check -o inline:"$msg\n" \
sysrc -f "${SYSRC_CONF}" -r test_flags+=extra
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Nov 20, 11:51 AM (9 h, 28 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41866954
Default Alt Text
D61742.1795175473.diff (3 KB)
Attached To
Mode
D61742: sysrc: Add "unchanged" messages
Attached
Detach File
Event Timeline