Merge pull request #137 from hadfl/pkg

pkg list should be able to refresh the local cache
omniosorg · Oct 31, 2022 · 5cbbae0 · 5cbbae0
2 parents 715f83a + 4ea8760
commit 5cbbae0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/lib/Zadm/Zones.pm b/lib/Zadm/Zones.pm
@@ -80,7 +80,9 @@ has brands  => sub {
     ];
 };
 has availbrands => sub($self) {
+    privSet({ add => 1, inherit => 1 }, PRIV_NET_ACCESS);
     my $pkg = $self->utils->readProc('pkg', [ qw(list -aHv), "$PKGPREFIX/*" ]);
+    privSet({ remove => 1, inherit => 1 }, PRIV_NET_ACCESS);
     # TODO: the state of sn1/s10 brands is currently unknown
     # while zadm can still be used to configure them we don't advertise them as available
     return [ grep { !/^(?:sn1|s10)$/ } map { m!\Q$PKGPREFIX\E/([^@/]+)\@! } @$pkg ];

diff --git a/test/lib/perl5/Sun/Solaris/Privilege.pm b/test/lib/perl5/Sun/Solaris/Privilege.pm
@@ -21,8 +21,8 @@ use constant {
 };
 
 my @constants = qw(PRIV_DEBUG PRIV_EFFECTIVE PRIV_FILE_DAC_READ PRIV_FILE_DAC_WRITE
-    PRIV_INHERITABLE PRIV_LIMIT PRIV_OFF PRIV_ON PRIV_PERMITTED PRIV_SET PRIV_STR_LIT
-    PRIV_STR_PORT PRIV_SYS_DL_CONFIG PRIV_SYS_MOUNT);
+    PRIV_INHERITABLE PRIV_LIMIT PRIV_NET_ACCESS PRIV_OFF PRIV_ON PRIV_PERMITTED
+    PRIV_SET PRIV_STR_LIT PRIV_STR_PORT PRIV_SYS_DL_CONFIG PRIV_SYS_MOUNT);
 
 our @EXPORT_OK = (@constants, qw(getppriv priv_addset priv_emptyset priv_fillset
     priv_intersect priv_set_to_str priv_str_to_set setpflags setppriv));