On 10/05/11 14:10, Danek Duvall wrote:
Shawn Walker wrote:
The following webrev is for a backport of current pkg gate bits to
build 151a:
https://cr.opensolaris.org/action/browse/pkg/swalker/pkg-bttf/webrev/
This appears to be a change against a changeset on the default branch, not
against the 2010.2H branch. That may be as intended, but it'd be nice to
have a bit more detail about what the change is that's being presented
here, so we know how to review it.
Are there any changes to the brand scripts, for instance? They show up as
new here, but I'm guessing that's because they're being reintroduced.
The brand scripts are from changeset 2219 of the gate just before the
dataset changes Mike made. The only differences from that are the
following:
diff -r 33dd51b5ca54 src/brand/pkgcreatezone
--- a/src/brand/pkgcreatezone Fri Feb 18 16:57:31 2011 -0800
+++ b/src/brand/pkgcreatezone Thu Oct 06 13:16:03 2011 -0700
@@ -517,7 +517,7 @@
#
pkglist="$pkglist
pkg:///service/network/network-clients
- pkg:///network/ping"
+ pkg:///network/ftp"
#
# Get at least one sensible shell, vim, ssh, ssh key utils, sshd.
@@ -590,6 +590,24 @@
printf "$m_done\n"
+# Clean up root as a role and jack if needed
+if grep "^root::::type=role;" $ZONEROOT/etc/user_attr >/dev/null 2>&1; then
+ printf "$m_brokenness\n"
+ #
+ # Remove "jack" user.
+ #
+ print "/^jack:/d\nw" | ed -s $ZONEROOT/etc/passwd
+ chmod u+w $ZONEROOT/etc/shadow
+ print "/^jack:/d\nw" | ed -s $ZONEROOT/etc/shadow
+ chmod u-w $ZONEROOT/etc/shadow
+
+ #
+ # Set root from a role back to... not a role. Grr.
+ #
+ print "s/^root::::type=role;/root::::/\nw" |
+ ed -s $ZONEROOT/etc/user_attr
+fi
+
#
# Make sure sysidtools run; we manually poke in the SSH action
# so that we get an SSH key. Yes, this is seriously borken.
Other than the brand scripts, the webrev accurately reflects the changes
I made. It's unfortunately the only one I could get webrev to generate.
I don't think it handles branches right.
-Shawn
_______________________________________________
pkg-discuss mailing list
[email protected]
http://mail.opensolaris.org/mailman/listinfo/pkg-discuss
