Permalink
Browse files

SmartOS 20111019 update

  • Loading branch information...
JohnSonnenschein committed Oct 19, 2011
1 parent 49b86bb commit f1641aa6a59720b6fc3d406042ff03dd17e4c4d8
Showing with 6,430 additions and 20,519 deletions.
  1. +50 −0 .gitignore
  2. +25 −3 Makefile
  3. +13 −0 configure
  4. +4 −2 configure.smartos
  5. +1 −0 man/man/man
  6. +1 −1 man/man/man1/zonestat.1
  7. +1 −1 man/man/man1m/vfsstat.1m
  8. +1 −1 man/man/man1m/ziostat.1m
  9. +1 −1 man/man/man1m/zonestatd.1m
  10. +1 −1 man/man/man7/ronn-format.7
  11. +1 −0 man/man/share
  12. +1 −0 man/man/usr
  13. +0 −1 man/usr/share/man
  14. +0 −18,766 manifest
  15. +0 −2 overlay/etc/cron.d/crontabs/root
  16. +0 −54 overlay/etc/nsswitch.conf
  17. 0 overlay/{ → generic}/etc/bash/bash_completion
  18. 0 overlay/{ → generic}/etc/bash/bash_completion.d/machines
  19. +1 −1 overlay/{ → generic}/etc/bash/bash_completion.d/vms
  20. 0 overlay/{ → generic}/etc/bash/bash_completion.d/zones
  21. 0 overlay/{ → generic}/etc/bash/bashrc.example
  22. 0 overlay/{ → generic}/etc/bash/inputrc.example
  23. +6 −0 overlay/generic/etc/cron.d/crontabs/root
  24. 0 overlay/{ → generic}/etc/crypto/pkcs11.conf
  25. 0 overlay/{ → generic}/etc/curl/curlCA
  26. 0 overlay/{ → generic}/etc/default/init
  27. 0 overlay/{ → generic}/etc/default/login
  28. 0 overlay/{ → generic}/etc/default/passwd
  29. 0 overlay/{ → generic}/etc/dispadmin.conf
  30. 0 overlay/{ → generic}/etc/driver_aliases
  31. 0 overlay/{ → generic}/etc/driver_classes
  32. 0 overlay/{ → generic}/etc/dumpadm.conf
  33. 0 overlay/{ → generic}/etc/group
  34. 0 overlay/{ → generic}/etc/inet/ntp.conf
  35. 0 overlay/{ → generic}/etc/inittab
  36. 0 overlay/{ → generic}/etc/issue
  37. 0 overlay/{ → generic}/etc/logadm.conf
  38. 0 overlay/{ → generic}/etc/minor_perm
  39. 0 overlay/{ → generic}/etc/motd
  40. 0 overlay/{ → generic}/etc/name_to_major
  41. 0 overlay/{ → generic}/etc/nodename
  42. 0 overlay/{ → generic}/etc/notices/COPYRIGHT
  43. 0 overlay/{ → generic}/etc/opasswd
  44. 0 overlay/{ → generic}/etc/ouser_attr
  45. 0 overlay/{ → generic}/etc/passwd
  46. 0 overlay/{ → generic}/etc/path_to_inst
  47. 0 overlay/{ → generic}/etc/release
  48. 0 overlay/{ → generic}/etc/resolv.conf
  49. 0 overlay/{ → generic}/etc/rtc_config
  50. 0 overlay/{ → generic}/etc/shadow
  51. 0 overlay/{ → generic}/etc/skel/.bashrc
  52. 0 overlay/{ → generic}/etc/ssh/sshd_config
  53. 0 overlay/{ → generic}/etc/svc/profile/generic.xml
  54. 0 overlay/{ → generic}/etc/svc/profile/platform.xml
  55. 0 overlay/{ → generic}/etc/system
  56. 0 overlay/{ → generic}/etc/user_attr
  57. 0 overlay/{ → generic}/etc/vfstab
  58. 0 overlay/{ → generic}/etc/zones/SUNWdefault.xml
  59. 0 overlay/{ → generic}/etc/zshrc
  60. BIN overlay/{ → generic}/kernel/drv/amd64/bnx
  61. BIN overlay/{ → generic}/kernel/drv/amd64/cpqary3
  62. 0 overlay/{ → generic}/kernel/drv/cpqary3.conf
  63. 0 overlay/{ → generic}/lib/sdc/config.sh
  64. 0 overlay/{ → generic}/lib/sdc/network.sh
  65. 0 overlay/{ → generic}/lib/sdc/zone.sh
  66. 0 overlay/{ → generic}/lib/svc/manifest/network/forwarding.xml
  67. 0 overlay/{ → generic}/lib/svc/manifest/network/ipfilter.xml
  68. 0 overlay/{ → generic}/lib/svc/manifest/network/network-location.xml
  69. 0 overlay/{ → generic}/lib/svc/manifest/network/network-physical.xml
  70. 0 overlay/{ → generic}/lib/svc/manifest/network/nfs/client.xml
  71. 0 overlay/{ → generic}/lib/svc/manifest/network/nfs/nlockmgr.xml
  72. 0 overlay/{ → generic}/lib/svc/manifest/network/nfs/server.xml
  73. 0 overlay/{ → generic}/lib/svc/manifest/system/auditd.xml
  74. 0 overlay/{ → generic}/lib/svc/manifest/system/console-login.xml
  75. 0 overlay/{ → generic}/lib/svc/manifest/system/coreadm.xml
  76. 0 overlay/{ → generic}/lib/svc/manifest/system/filesystem/joyent-fs.xml
  77. 0 overlay/{ → generic}/lib/svc/manifest/system/filesystem/minimal-fs.xml
  78. +52 −0 overlay/generic/lib/svc/manifest/system/smartdc-beacon.xml
  79. 0 overlay/{ → generic}/lib/svc/manifest/system/smartdc-config.xml
  80. 0 overlay/{ → generic}/lib/svc/manifest/system/smartdc-init.xml
  81. 0 overlay/{ → generic}/lib/svc/manifest/system/smartdc-vmadmd.xml
  82. 0 overlay/{ → generic}/lib/svc/manifest/system/sysidtool.xml
  83. 0 overlay/{ → generic}/lib/svc/method/console-login
  84. 0 overlay/{ → generic}/lib/svc/method/fs-root
  85. 0 overlay/{ → generic}/lib/svc/method/fs-usr
  86. 0 overlay/{ → generic}/lib/svc/method/identity-node
  87. 0 overlay/{ → generic}/lib/svc/method/ipfilter
  88. 0 overlay/{ → generic}/lib/svc/method/manifest-import
  89. +3 −1 overlay/{ → generic}/lib/svc/method/smartdc-init
  90. 0 overlay/{ → generic}/lib/svc/method/smartdc-vmadmd
  91. 0 overlay/{ → generic}/lib/svc/method/sshd
  92. 0 overlay/{ → generic}/lib/svc/method/sysidtool-net
  93. 0 overlay/{ → generic}/lib/svc/method/sysidtool-system
  94. +116 −0 overlay/generic/manifest
  95. 0 overlay/{ → generic}/usr/bin/ack
  96. +109 −303 overlay/{ → generic}/usr/bin/json
  97. 0 overlay/{ → generic}/usr/include/usb.h
  98. 0 overlay/{ → generic}/usr/lib/brand/joyent/manifests
  99. 0 overlay/{ → generic}/usr/lib/localedef/extensions/UTF-8.x
  100. +116 −0 overlay/generic/usr/sbin/joycomm
  101. 0 overlay/{ → generic}/usr/sbin/zonememstat
  102. 0 overlay/{ → generic}/usr/share/man/man1/ack.1
  103. 0 overlay/{ → generic}/usr/share/man/man1/json.1
  104. BIN overlay/{ → generic}/var/ld/amd64/ld.config
  105. BIN overlay/{ → generic}/var/ld/ld.config
  106. +12 −6 overlay/{ → smartos}/lib/svc/method/fs-joyent
  107. 0 overlay/{ → smartos}/lib/svc/method/net-physical
  108. 0 overlay/{ → smartos}/lib/svc/method/smartdc-config
  109. +13 −0 overlay/smartos/manifest
  110. 0 overlay/{admin → smartos/root}/.bash_profile
  111. 0 overlay/{admin → smartos/root}/.bashrc
  112. 0 overlay/{admin → smartos/root}/.profile
  113. 0 overlay/{ → smartos}/smartdc/bin/smartos_prompt_config.sh
  114. BIN overlay/usr/lib/amd64/libCrun.so.1
  115. BIN overlay/usr/lib/libCrun.so.1
  116. +9 −3 src/Makefile
  117. +256 −63 src/{create-machine.js → machine/machine-create.js}
  118. +56 −9 src/machine/machine-json.js
  119. +310 −0 src/machine/machine-lookup.js
  120. +179 −0 src/manifest
  121. +341 −0 src/node-kstat/kstat.cc
  122. +17 −0 src/node-kstat/wscript
  123. +115 −0 src/node_modules/system.js
  124. +94 −243 src/sysinfo
  125. +3 −1 src/vmadm.js
  126. +59 −13 src/vmadmd.js
  127. +10 −3 src/vmcfg.js
  128. +7 −3 tools/build_illumos
  129. +4 −8 tools/build_iso
  130. +73 −0 tools/build_manifest
  131. +1 −1 tools/builder/Makefile
  132. +10 −0 tools/builder/build_users_c.sh
  133. +1 −0 tools/builder/file_cp.c
  134. +1 −0 tools/get_status
  135. +4,353 −1,027 tools/pwgen-2.06/configure
  136. +3 −1 tools/sorter
View
@@ -0,0 +1,50 @@
+/configure.*
+/configure-*
+/output
+/projects
+/proto
+/log
+/src/bootparams
+/src/disk_size
+/src/removable_disk
+/src/disklist
+/src/node-kstat/.lock-wscript
+/src/node-kstat/build
+/tools/builder/builder
+/tools/builder/*.o
+/tools/builder/users.c
+/tools/builder/users.c.tmp
+/tools/cryptpass
+/tools/pwgen
+/tools/pwgen-2.06/configure
+/0-*-stamp
+/manifest.new
+zonestat.1
+zonestatd.1m
+ronn-format.7
+man/man/man1m/vfsstat.1m
+man/man/man1m/ziostat.1m
+src/has_hvx
+src/marco
+src/polo
+src_addon/bind/bind-9.8.0/
+src_addon/ipmi/ipmitool-1.8.11/
+src_addon/libreadline/config.log
+src_addon/libreadline/config.status
+src_addon/libreadline/*.o
+src_addon/libreadline/*.a
+src_addon/libreadline/shlib/*.so
+src_addon/libusb/*.1
+src_addon/cpp/cpp
+src_addon/cpp/cpp.o
+src_addon/cpp/y.tab.c
+src_addon/cpp/y.tab.o
+src_addon/libreadline/shlib/libhistory.so.5
+src_addon/libreadline/shlib/libreadline.so.5
+src_addon/libusb/wr_libusb.o
+tools/pwgen-2.06/Makefile
+tools/pwgen-2.06/autom4te.cache
+manifest.gen
+manifest.d/
+overlay/order
+overlay/sdc
View
@@ -2,16 +2,33 @@
ROOT=$(PWD)
PROTO=$(ROOT)/proto
+MPROTO=$(ROOT)/manifest.d
PATH=/opt/local/bin:/opt/local/sbin:/opt/local/gcc34/bin:/usr/xpg4/bin:/usr/bin:/usr/sbin:/usr/sfw/bin:/usr/openwin/bin:/opt/SUNWspro/bin:/usr/ccs/bin
LOCAL_SUBDIRS:=$(shell ls projects/local)
+MANIFEST=manifest.gen
+OVERLAYS:=$(shell cat overlay/order)
world: 0-illumos-stamp 0-extra-stamp 0-livesrc-stamp 0-local-stamp \
0-tools-stamp 0-man-stamp 0-devpro-stamp
-live: world
+live: world manifest
(cd $(ROOT)/src_addon && gmake DESTDIR=$(PROTO) install)
mkdir -p ${ROOT}/log
- (cd $(ROOT) && pfexec ./tools/build_live $(ROOT)/manifest $(ROOT)/output $(ROOT)/overlay $(ROOT)/proto $(ROOT)/man/)
+ (cd $(ROOT) && pfexec ./tools/build_live $(ROOT)/$(MANIFEST) $(ROOT)/output $(OVERLAYS) $(ROOT)/proto $(ROOT)/man/man)
+
+manifest:
+ rm -f $(MANIFEST) $(MPROTO)/*
+ -[ ! -d $(MPROTO) ] && mkdir $(MPROTO)
+ cp src/manifest $(MPROTO)/live.manifest
+ cp projects/illumos/manifest $(MPROTO)/illumos.manifest
+ gmake DESTDIR=$(MPROTO) DESTNAME=illumos-extra.manifest -C projects/illumos-extra manifest
+ [ ! -d projects/local ] || for dir in $(LOCAL_SUBDIRS); do \
+ cd $(ROOT)/projects/local/$${dir}; \
+ if [[ -f Makefile.joyent ]]; then \
+ gmake DESTDIR=$(MPROTO) DESTNAME=$${dir}.manifest -f Makefile.joyent \
+ manifest; else gmake DESTDIR=$(MPROTO) DESTNAME=$${dir}.manifest manifest; fi; done
+ for dir in $(OVERLAYS); do cp $${dir}/manifest $(MPROTO)/overlay-$$(basename $${dir}).manifest; done
+ ./tools/build_manifest
update:
./tools/update_base
@@ -53,12 +70,15 @@ update:
(cd $(ROOT)/tools/builder && gmake builder)
0-pwgen-stamp:
- (cd ${ROOT}/tools/pwgen-* && ./configure && make && cp pwgen ${ROOT}/tools)
+ (cd ${ROOT}/tools/pwgen-* && autoconf && ./configure \
+ && make && cp pwgen ${ROOT}/tools)
tools/cryptpass: tools/cryptpass.c
(cd ${ROOT}/tools && gcc -Wall -W -O2 -o cryptpass cryptpass.c)
clean:
+ rm -f $(MANIFEST)
+ rm -rf $(ROOT)/$(MPROTO)/*
(cd $(ROOT)/src && gmake clean)
[ ! -d $(ROOT)/projects/illumos-extra ] || (cd $(ROOT)/projects/illumos-extra && gmake clean)
[ ! -d projects/local ] || for dir in $(LOCAL_SUBDIRS); do \
@@ -68,3 +88,5 @@ clean:
(cd $(ROOT) && rm -rf $(PROTO))
(cd $(ROOT) && mkdir -p $(PROTO))
rm -f 0-*-stamp
+
+.PHONY: manifest
View
@@ -156,6 +156,19 @@ if [ ! -f "projects/illumos-extra/Makefile" ]; then
fi
ROOT=`pwd`
+echo "==> Setting up overlay"
+
+if [ -z "${OVERLAYS}" ]; then
+ echo "FATAL: overlay order not specified"
+ exit 1
+fi
+
+rm -f ${ROOT}/overlay/order
+touch ${ROOT}/overlay/order
+for entry in ${OVERLAYS}; do
+ echo -n "${ROOT}/overlay/${entry} " >> ${ROOT}/overlay/order
+done
+
echo "==> Setting up illumos-gate"
cd ${ROOT}/projects/illumos
View
@@ -41,10 +41,12 @@ EOF
fi
PUBLISHER="illumos"
-RELEASE_VER="joyent_147"
+RELEASE_VER="smartos_20111019"
SUNW_SPRO12_URL=""
SUNW_SPRO12u1_URL=""
ON_CLOSED_BINS_URL="http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins.i386.tar.bz2"
ON_CLOSED_BINS_ND_URL="http://dlc.sun.com/osol/on/downloads/20100817/on-closed-bins-nd.i386.tar.bz2"
-GET_ILLUMOS="(git clone https://github.com/joyent/illumos-joyent.git illumos)"
+GET_ILLUMOS="(git clone https://github.com/joyent/illumos-joyent illumos)"
GET_ILLUMOS_EXTRA="git clone https://github.com/joyent/illumos-extra.git illumos-extra"
+
+OVERLAYS="smartos generic"
View
View
@@ -1,7 +1,7 @@
.\" Generated with Ronnjs/v0.1
.\" http://github.com/kapouer/ronnjs/
.
-.TH "ZONESTAT" "1" "September 2011" "" ""
+.TH "ZONESTAT" "1" "October 2011" "" ""
.
.SH "NAME"
\fBzonestat\fR \-\- report active zone statistics\.
View
@@ -1,7 +1,7 @@
.\" Generated with Ronnjs/v0.1
.\" http://github.com/kapouer/ronnjs/
.
-.TH "VFSSTAT" "1m" "September 2011" "" ""
+.TH "VFSSTAT" "1m" "October 2011" "" ""
.
.SH "NAME"
\fBvfsstat\fR \-\- Report VFS read and write activity
View
@@ -1,7 +1,7 @@
.\" Generated with Ronnjs/v0.1
.\" http://github.com/kapouer/ronnjs/
.
-.TH "ZIOSTAT" "1m" "September 2011" "" ""
+.TH "ZIOSTAT" "1m" "October 2011" "" ""
.
.SH "NAME"
\fBziostat\fR \-\- Report ZFS read I/O activity
@@ -1,7 +1,7 @@
.\" Generated with Ronnjs/v0.1
.\" http://github.com/kapouer/ronnjs/
.
-.TH "ZONESTATD" "1m" "September 2011" "" ""
+.TH "ZONESTATD" "1m" "October 2011" "" ""
.
.SH "NAME"
\fBzonestatd\fR \-\- zones monitoring daemon
@@ -1,7 +1,7 @@
.\" Generated with Ronnjs/v0.1
.\" http://github.com/kapouer/ronnjs/
.
-.TH "RONN\-FORMAT" "7" "September 2011" "" ""
+.TH "RONN\-FORMAT" "7" "October 2011" "" ""
.
.SH "NAME"
\fBronn-format\fR \-\- manual authoring format based on Markdown
View
View
View
Oops, something went wrong.

0 comments on commit f1641aa

Please sign in to comment.