resolvconf: Allow -p to list private entries without -a

Author: rsmarples

resolvconf.8.in

@@ -22,7 +22,7 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-.Dd March 24, 2025
+.Dd April 21, 2025
 .Dt RESOLVCONF 8
 .Os
 .Sh NAME
@@ -46,7 +46,7 @@
 .Fl d Ar interface Ns Op Ar .protocol
 .Nm
 .Op Fl x
-.Fl iLl Ar pattern
+.Fl iLlp Ar pattern
 .Nm
 .Fl u
 .Nm
@@ -149,10 +149,14 @@ Only really useful for deleting interfaces.
 Set the metric of the interface when adding it, default of 0.
 Lower metrics take precedence.
 This affects the default order of interfaces when listed.
-.It Fl p
+.It Fl p Op Ar pattern
 Marks the interface
 .Pa resolv.conf
-as private.
+as private if the
+.Fl a
+command is given, otherwise private interfaces matching
+.Ar pattern
+are listed.
 .It Fl x
 Mark the interface
 .Pa resolv.conf
@@ -162,13 +166,13 @@ as exclusive when adding, otherwise only use the latest exclusive interface.
 .Nm
 has some more commands for general usage:-
 .Bl -tag -width pattern_opt
-.It Fl i Ar pattern
+.It Fl i Op Ar pattern
 List the interfaces and protocols, optionally matching
 .Ar pattern ,
 we have
 .Pa resolv.conf
 files for.
-.It Fl L Ar pattern
+.It Fl L Op Ar pattern
 List the
 .Pa resolv.conf
 files we have,
@@ -179,7 +183,7 @@ If
 .Ar pattern
 is specified then we list the files for the interfaces and protocols
 that match it.
-.It Fl l Ar pattern
+.It Fl l Op Ar pattern
 List the
 .Pa resolv.conf
 files we have.

resolvconf.in

@@ -167,6 +167,8 @@ resolv_strip()
 
 private_iface()
 {
+	iface="$1"
+
 	# Allow expansion
 	cd "$IFACEDIR"
 
@@ -650,6 +652,19 @@ list_resolv()
 	return $retval
 }
 
+list_private()
+{
+	IFACES=
+	for i in $(list_resolv -i $@ 2>/dev/null); do
+		if private_iface "$i"; then
+			IFACES="${IFACES}${IFACES:+ }$i"
+		fi
+	done
+	if [ -n "$IFACES" ]; then
+		echo "$IFACES"
+	fi
+}
+
 list_remove()
 {
 	[ -z "$2" ] && return 0
@@ -828,6 +843,10 @@ done
 shift $(($OPTIND - 1))
 args="$iface${iface:+ }$*"
 
+if [ -z "$cmd" ] && [ "$IF_PRIVATE" = 1 ]; then
+	cmd=p
+fi
+
 # -I inits the state dir
 if [ "$cmd" = I ]; then
 	if [ -d "$VARDIR" ]; then
@@ -850,7 +869,12 @@ fi
 # -L is the same as -l, but post-processed from our config
 if [ "$cmd" = L ]; then
 	list_resolv "-$cmd" "$args" | replace
-	exit $?2
+	exit $?
+fi
+
+if [ "$cmd" = p ]; then
+	list_private "$args"
+	exit $?
 fi
 
 # Restart a service or echo the command to restart a service