summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorespie <espie@openbsd.org>2015-01-04 14:54:12 +0000
committerespie <espie@openbsd.org>2015-01-04 14:54:12 +0000
commit9dbe10b427c1357ee4a8ffd4f296cee394ff81c9 (patch)
tree5016d1ce3510aa5b192bf1f7ea88aa636a1add43
parentcleaner logic, fix things so that fw_update -da makes sense (diff)
downloadwireguard-openbsd-9dbe10b427c1357ee4a8ffd4f296cee394ff81c9.tar.xz
wireguard-openbsd-9dbe10b427c1357ee4a8ffd4f296cee394ff81c9.zip
same semantics as old program
-rw-r--r--usr.sbin/pkg_add/OpenBSD/FwUpdate.pm8
1 files changed, 4 insertions, 4 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/FwUpdate.pm b/usr.sbin/pkg_add/OpenBSD/FwUpdate.pm
index d644885c229..0ac99e28d75 100644
--- a/usr.sbin/pkg_add/OpenBSD/FwUpdate.pm
+++ b/usr.sbin/pkg_add/OpenBSD/FwUpdate.pm
@@ -1,7 +1,7 @@
#! /usr/bin/perl
# ex:ts=8 sw=4:
-# $OpenBSD: FwUpdate.pm,v 1.4 2015/01/04 14:48:19 espie Exp $
+# $OpenBSD: FwUpdate.pm,v 1.5 2015/01/04 14:54:12 espie Exp $
#
# Copyright (c) 2014 Marc Espie <espie@openbsd.org>
#
@@ -227,12 +227,12 @@ sub process_parameters
if (@ARGV == 0) {
if ($state->opt('d')) {
for my $driver ($state->installed_drivers) {
- if (!$state->is_needed($driver)) {
+ if ($state->opt('a') ||
+ !$state->is_needed($driver)) {
$self->to_remove($state, $driver);
}
}
- }
- if ($state->opt('a') || !$state->opt('d')) {
+ } else {
for my $driver ($state->machine_drivers) {
$self->to_add_or_update($state, $driver);
}