Index: head/net-mgmt/Makefile =================================================================== --- head/net-mgmt/Makefile (revision 454293) +++ head/net-mgmt/Makefile (revision 454294) @@ -1,398 +1,399 @@ # $FreeBSD$ # COMMENT = Network management tools SUBDIR += 2ping SUBDIR += TkTopNetFlows SUBDIR += adcli SUBDIR += aggregate SUBDIR += aircrack-ng SUBDIR += alertmanager SUBDIR += ap-utils SUBDIR += argus3 SUBDIR += argus3-clients SUBDIR += arpalert SUBDIR += arpscan SUBDIR += arpwatch SUBDIR += arts++ SUBDIR += bandwidthd SUBDIR += bgpq SUBDIR += bgpq3 SUBDIR += bgpuma SUBDIR += blackbox_exporter SUBDIR += bpft SUBDIR += braa SUBDIR += bsnmp-jails SUBDIR += bsnmp-regex SUBDIR += bsnmp-ucd SUBDIR += bwm-ng SUBDIR += cacti SUBDIR += cacti-spine SUBDIR += cacti88 SUBDIR += cacti88-spine SUBDIR += ccnet-client SUBDIR += ccnet-server SUBDIR += cdpd SUBDIR += cdpr SUBDIR += cdpsnarf SUBDIR += centreon-clib SUBDIR += check_ipmi_sensor SUBDIR += check_logfiles SUBDIR += check_multi SUBDIR += check_mysql_health SUBDIR += chillispot SUBDIR += choparp SUBDIR += cidr SUBDIR += ciscoconf SUBDIR += clog SUBDIR += cnagios SUBDIR += collectd5 SUBDIR += confregdecode SUBDIR += coovachilli SUBDIR += cowpatty SUBDIR += cricket SUBDIR += crmsh SUBDIR += darkstat SUBDIR += devmon SUBDIR += devmon-templates SUBDIR += dhcdrop SUBDIR += dhcp_probe SUBDIR += disco SUBDIR += dnsmap SUBDIR += docsis SUBDIR += driftnet SUBDIR += ehnt SUBDIR += etherape SUBDIR += ettercap SUBDIR += fastnetmon SUBDIR += fetchconfig SUBDIR += flow-extract SUBDIR += flow-tools SUBDIR += flowd SUBDIR += flowviewer SUBDIR += fprobe SUBDIR += glpi-plugins-fusioninventory-server SUBDIR += gnu-ipcalc SUBDIR += grepcidr SUBDIR += grepip SUBDIR += gsnmp SUBDIR += guifi-snpservices SUBDIR += hastmon SUBDIR += hawk SUBDIR += icinga SUBDIR += icinga-classicweb SUBDIR += icinga-core SUBDIR += icinga2 SUBDIR += icingaweb2 SUBDIR += icingaweb2-module-businessprocess SUBDIR += icingaweb2-module-cube SUBDIR += icingaweb2-module-director SUBDIR += icingaweb2-module-generictts SUBDIR += icingaweb2-module-grafana SUBDIR += icingaweb2-module-map SUBDIR += icingaweb2-module-vsphere SUBDIR += icli SUBDIR += icmpmonitor SUBDIR += icmpquery SUBDIR += iftop SUBDIR += intel-snap SUBDIR += iog SUBDIR += ipacctd SUBDIR += ipaudit SUBDIR += ipcad SUBDIR += ipcalc SUBDIR += ipplan SUBDIR += iprange SUBDIR += ipv6calc SUBDIR += ipv6gen SUBDIR += ipv6mon SUBDIR += irrtoolset SUBDIR += isic SUBDIR += jnettop SUBDIR += kapacitor SUBDIR += kismet SUBDIR += klg SUBDIR += lanmap SUBDIR += lg SUBDIR += librenms SUBDIR += librenms-agent SUBDIR += libsmi SUBDIR += lldpd SUBDIR += mbrowse SUBDIR += mdata-client SUBDIR += mk-livestatus SUBDIR += monitoring-plugins SUBDIR += mrtg SUBDIR += mrtg-ping-probe SUBDIR += mtrace SUBDIR += mysqld_exporter SUBDIR += nagcon SUBDIR += nagios SUBDIR += nagios-certexp-plugin SUBDIR += nagios-check_bacula SUBDIR += nagios-check_bacula9 SUBDIR += nagios-check_clamav SUBDIR += nagios-check_cpu_usage SUBDIR += nagios-check_dhcp.pl SUBDIR += nagios-check_email_delivery SUBDIR += nagios-check_hdd_health SUBDIR += nagios-check_hp_bladechassis SUBDIR += nagios-check_memcached_paranoid SUBDIR += nagios-check_mysql_slave SUBDIR += nagios-check_netsnmp SUBDIR += nagios-check_ports SUBDIR += nagios-check_postgres SUBDIR += nagios-check_puppet SUBDIR += nagios-check_relayd_status SUBDIR += nagios-check_smartmon SUBDIR += nagios-check_tftp SUBDIR += nagios-check_zpools SUBDIR += nagios-geom SUBDIR += nagios-openldap-plugins SUBDIR += nagios-pf-plugin SUBDIR += nagios-plugins SUBDIR += nagios-snmp-plugins SUBDIR += nagios-snmp-plugins-extras SUBDIR += nagios-spamd-plugin SUBDIR += nagios4 SUBDIR += nagiosagent SUBDIR += nagiosgraph SUBDIR += nagiosql SUBDIR += nagircbot SUBDIR += nagnu SUBDIR += nagstamon SUBDIR += nagtail SUBDIR += nagvis SUBDIR += nbtscan SUBDIR += ndoutils SUBDIR += ndpmon SUBDIR += nedi SUBDIR += nefu SUBDIR += net-snmp SUBDIR += netdata SUBDIR += netdisco SUBDIR += netdisco-mibs SUBDIR += netdot SUBDIR += netleak SUBDIR += netmagis-common SUBDIR += netmagis-database SUBDIR += netmagis-detecteq SUBDIR += netmagis-metro SUBDIR += netmagis-servers SUBDIR += netmagis-topo SUBDIR += netmagis-utils SUBDIR += netmagis-www SUBDIR += netmask SUBDIR += netspoc SUBDIR += netustad SUBDIR += netwag SUBDIR += networkmgr SUBDIR += netwox SUBDIR += netxms SUBDIR += nfdump SUBDIR += nfsen SUBDIR += ng_ipacct SUBDIR += nitpicker SUBDIR += nrpe SUBDIR += nrpe-ssl SUBDIR += nrpe3 SUBDIR += nsca SUBDIR += nsca-client SUBDIR += nsca-ng SUBDIR += nsca-ng-client SUBDIR += nsca27 SUBDIR += nsca27-client SUBDIR += nstat SUBDIR += nstreams SUBDIR += observium SUBDIR += ocsinventory-agent SUBDIR += ocsinventory-ng SUBDIR += omping SUBDIR += onionlauncher SUBDIR += openbmp SUBDIR += openlldp SUBDIR += openvmps SUBDIR += p0f SUBDIR += p0f2 SUBDIR += p5-AnyEvent-SNMP SUBDIR += p5-BigIP-iControl SUBDIR += p5-Cflow SUBDIR += p5-Cisco-CopyConfig SUBDIR += p5-Cisco-Reconfig SUBDIR += p5-Data-Validate-IP SUBDIR += p5-FusionInventory-Agent SUBDIR += p5-FusionInventory-Agent-Task-NetDiscovery SUBDIR += p5-FusionInventory-Agent-Task-SNMPQuery SUBDIR += p5-GRNOC-Config SUBDIR += p5-GRNOC-TL1 SUBDIR += p5-MRTG-Parse SUBDIR += p5-Mon SUBDIR += p5-Monitoring-Plugin SUBDIR += p5-NSNMP SUBDIR += p5-Nagios-Object SUBDIR += p5-Nagios-Plugin SUBDIR += p5-Nagios-Plugin-Beanstalk SUBDIR += p5-Nagios-Plugin-LDAP SUBDIR += p5-Nagios-Plugins-Memcached SUBDIR += p5-Net-ACL SUBDIR += p5-Net-Abuse-Utils SUBDIR += p5-Net-Abuse-Utils-Spamhaus SUBDIR += p5-Net-CIDR SUBDIR += p5-Net-ILO SUBDIR += p5-Net-IP SUBDIR += p5-Net-IP-Match-Regexp SUBDIR += p5-Net-IP-Match-XS SUBDIR += p5-Net-IP-Resolver SUBDIR += p5-Net-IPAddress SUBDIR += p5-Net-IPv4Addr SUBDIR += p5-Net-IPv6Addr SUBDIR += p5-Net-NSCA-Client SUBDIR += p5-Net-Netmask SUBDIR += p5-Net-OpenVPN-Manage SUBDIR += p5-Net-SNMP SUBDIR += p5-Net-SNMP-Util SUBDIR += p5-Net-SNMPTrapd SUBDIR += p5-Net-Telnet-Cisco-IOS SUBDIR += p5-NetAddr-IP SUBDIR += p5-NetAddr-IP-Lite SUBDIR += p5-NetApp SUBDIR += p5-POE-Component-SNMP SUBDIR += p5-SNMP-Info SUBDIR += p5-SNMP-MIB-Compiler SUBDIR += p5-SNMP-Simple SUBDIR += p5-SNMP-Trapinfo SUBDIR += p5-SNMP-Util SUBDIR += p5-SNMP_Session SUBDIR += p5-Telnet-Cisco SUBDIR += p5-Tie-NetAddr-IP SUBDIR += p5-Xymon SUBDIR += p5-Xymon-Client SUBDIR += p5-Xymon-Server SUBDIR += p5-Zenoss SUBDIR += p5-jmx4perl SUBDIR += packit SUBDIR += pads SUBDIR += pancho SUBDIR += pandorafms_agent SUBDIR += pandorafms_console SUBDIR += pandorafms_server SUBDIR += pdagent-integrations SUBDIR += percona-monitoring-plugins SUBDIR += pftabled SUBDIR += php56-snmp SUBDIR += php70-snmp SUBDIR += php71-snmp SUBDIR += phpip SUBDIR += phpipam SUBDIR += phpweathermap SUBDIR += pixilate SUBDIR += pktstat SUBDIR += pmacct SUBDIR += pnp SUBDIR += pnp-icinga SUBDIR += pnp-icinga2 SUBDIR += portmon SUBDIR += prometheus SUBDIR += pushgateway SUBDIR += py-adal SUBDIR += py-ipcalc SUBDIR += py-ipy SUBDIR += py-msrest SUBDIR += py-msrestazure SUBDIR += py-pdagent SUBDIR += py-pyang SUBDIR += py-pynsca SUBDIR += py-pysmi SUBDIR += py-pyzabbix SUBDIR += py-snmp4 SUBDIR += py-snmp4-apps SUBDIR += py-snmp4-mibs SUBDIR += py-snmp_passpersist SUBDIR += py-yapsnmp SUBDIR += py3-dnsdiag SUBDIR += qkismet SUBDIR += rackmonkey SUBDIR += rancid3 SUBDIR += rate SUBDIR += rcpd SUBDIR += remarp SUBDIR += resource-agents SUBDIR += riemann SUBDIR += riemann-c-client SUBDIR += rotorouter SUBDIR += routers2 SUBDIR += routers2-extensions SUBDIR += routers2-extras SUBDIR += rrdbot SUBDIR += rubygem-blimpy SUBDIR += rubygem-oxidized SUBDIR += rubygem-oxidized-script SUBDIR += rubygem-oxidized-web SUBDIR += rubygem-snmp SUBDIR += rubygem-visage-app SUBDIR += sblim-wbemcli SUBDIR += scli SUBDIR += sdig SUBDIR += seafile-client SUBDIR += seafile-gui SUBDIR += seafile-server SUBDIR += semaphore SUBDIR += send SUBDIR += sendip SUBDIR += sipcalc SUBDIR += sjitter SUBDIR += slate SUBDIR += smokeping SUBDIR += snmp++ SUBDIR += snmp4nagios SUBDIR += snmptt SUBDIR += softflowd SUBDIR += spectools SUBDIR += ssgless SUBDIR += statsd SUBDIR += statsite SUBDIR += subcalc SUBDIR += super_mediator SUBDIR += sx SUBDIR += sysmon SUBDIR += tcpreplay SUBDIR += tcptrack SUBDIR += telegraf SUBDIR += tornova SUBDIR += torrus + SUBDIR += triton-guesttools SUBDIR += unbound_exporter SUBDIR += unifi5 SUBDIR += victorops-nagios SUBDIR += vidalia SUBDIR += virt-viewer SUBDIR += wdiag SUBDIR += weplab SUBDIR += whatmask SUBDIR += wifimgr SUBDIR += wmi-client SUBDIR += xymon-client SUBDIR += xymon-server SUBDIR += yaf SUBDIR += zabbix2-agent SUBDIR += zabbix2-frontend SUBDIR += zabbix2-proxy SUBDIR += zabbix2-server SUBDIR += zabbix22-agent SUBDIR += zabbix22-frontend SUBDIR += zabbix22-proxy SUBDIR += zabbix22-server SUBDIR += zabbix3-agent SUBDIR += zabbix3-frontend SUBDIR += zabbix3-proxy SUBDIR += zabbix3-server SUBDIR += zabbix32-agent SUBDIR += zabbix32-frontend SUBDIR += zabbix32-proxy SUBDIR += zabbix32-server SUBDIR += zabbix34-agent SUBDIR += zabbix34-frontend SUBDIR += zabbix34-proxy SUBDIR += zabbix34-server .include Index: head/net-mgmt/triton-guesttools/Makefile =================================================================== --- head/net-mgmt/triton-guesttools/Makefile (nonexistent) +++ head/net-mgmt/triton-guesttools/Makefile (revision 454294) @@ -0,0 +1,47 @@ +# $FreeBSD$ + +PORTNAME= triton-guesttools +PORTVERSION= 0.0.0.0s2017111501 +CATEGORIES= net-mgmt + +MAINTAINER= swills@FreeBSD.org +COMMENT= FreeBSD guest tools for use with SmartOS + +RUN_DEPENDS= bash:shells/bash \ + mdata-client>0:net-mgmt/mdata-client + +USES= shebangfix +USE_GITHUB= yes +GH_ACCOUNT= joyent +GH_TAGNAME= 34c19b0 +GH_PROJECT= freebsd-kvm-image-builder + +WRKSRC_SUBDIR= triton-freebsd-guesttools +SHEBANG_FILES= ${WRKSRC}/lib/smartdc/add-network-interface \ + ${WRKSRC}/lib/smartdc/common.lib \ + ${WRKSRC}/lib/smartdc/firstboot \ + ${WRKSRC}/lib/smartdc/format-secondary-disk \ + ${WRKSRC}/lib/smartdc/get-user-data \ + ${WRKSRC}/lib/smartdc/run-operator-script \ + ${WRKSRC}/lib/smartdc/run-user-script \ + ${WRKSRC}/lib/smartdc/set-hostname \ + ${WRKSRC}/lib/smartdc/set-root-authorized-keys \ + ${WRKSRC}/lib/smartdc/set-rootpassword \ + ${WRKSRC}/lib/smartdc/triton + +post-extract: + @${RM} -r ${WRKSRC}/usr + +post-patch: + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/etc/rc.d/triton + +do-build: + @${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX},' ${WRKSRC}/etc/rc.d/triton ${WRKSRC}/lib/smartdc/* + +do-install: + ${MKDIR} ${STAGEDIR}${PREFIX}/lib ${STAGEDIR}${PREFIX}/etc/rc.d + ${INSTALL_SCRIPT} ${WRKSRC}/etc/rc.d/triton ${STAGEDIR}${PREFIX}/etc/rc.d + ( cd ${WRKSRC}/lib/ && \ + ${COPYTREE_BIN} smartdc ${STAGEDIR}${PREFIX}/lib ) + +.include Property changes on: head/net-mgmt/triton-guesttools/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/distinfo =================================================================== --- head/net-mgmt/triton-guesttools/distinfo (nonexistent) +++ head/net-mgmt/triton-guesttools/distinfo (revision 454294) @@ -0,0 +1,3 @@ +TIMESTAMP = 1510774567 +SHA256 (joyent-freebsd-kvm-image-builder-0.0.0.0s2017111501-34c19b0_GH0.tar.gz) = b901079b40c14101f7568b99d838324f2917a26105f0046b011d19cf71893b0c +SIZE (joyent-freebsd-kvm-image-builder-0.0.0.0s2017111501-34c19b0_GH0.tar.gz) = 89163 Property changes on: head/net-mgmt/triton-guesttools/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-etc_rc.d_triton =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-etc_rc.d_triton (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-etc_rc.d_triton (revision 454294) @@ -0,0 +1,22 @@ +--- etc/rc.d/triton.orig 2017-05-22 19:41:07 UTC ++++ etc/rc.d/triton +@@ -7,16 +7,18 @@ + . /etc/rc.subr + + name="triton" ++rcvar=triton_enable + + + start_cmd="${name}_start" + stop_cmd=":" + + load_rc_config $name ++: ${triton_enable:=NO} + + triton_start() + { +- /lib/smartdc/triton ++ %%PREFIX%%/lib/smartdc/triton + } + + run_rc_command "$1" Property changes on: head/net-mgmt/triton-guesttools/files/patch-etc_rc.d_triton ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_add-network-interface =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_add-network-interface (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_add-network-interface (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/add-network-interface.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/add-network-interface +@@ -4,7 +4,7 @@ + # This script checks new network interfaces for and enables via DHCP at boot. + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + nic_added=n + Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_add-network-interface ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_common.lib =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_common.lib (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_common.lib (revision 454294) @@ -0,0 +1,21 @@ +--- lib/smartdc/common.lib.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/common.lib +@@ -3,15 +3,15 @@ + # + # Copyright (c) 2016 Joyent Inc., All rights reserved. + # +-# Common variables used by scripts in /lib/smartdc ++# Common variables used by scripts in %%PREFIX%%/lib/smartdc + + # location of binaries that functions use + LOGGER=/usr/bin/logger +-MDATA_GET='/usr/sbin/mdata-get' ++MDATA_GET='%%PREFIX%%/sbin/mdata-get' + + set -o xtrace + +-# Common functions used by scripts /lib/smartdc ++# Common functions used by scripts %%PREFIX%%/lib/smartdc + + lib_triton_fatal() { + echo "(fatal) - $0 - $@" Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_common.lib ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_firstboot =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_firstboot (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_firstboot (revision 454294) @@ -0,0 +1,23 @@ +--- lib/smartdc/firstboot.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/firstboot +@@ -4,16 +4,16 @@ + # For scripts that should be run on first boot only + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + # Set root password if root_pw is set in the image manifest +-(/lib/smartdc/set-rootpassword) ++(%%PREFIX%%/lib/smartdc/set-rootpassword) + + # Format disk +-(/lib/smartdc/format-secondary-disk) ++(%%PREFIX%%/lib/smartdc/format-secondary-disk) + + # Disable firstboot once all scripts are run + lib_triton_info "Disabling firstboot" +-touch /lib/smartdc/.firstboot-complete-do-not-delete ++touch %%PREFIX%%/lib/smartdc/.firstboot-complete-do-not-delete + + exit 0 Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_firstboot ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_format-secondary-disk =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_format-secondary-disk (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_format-secondary-disk (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/format-secondary-disk.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/format-secondary-disk +@@ -10,7 +10,7 @@ + # By default we provision the whole disk as one partition + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + DATADISKDEVICE='vtbd1' + GPART=/sbin/gpart Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_format-secondary-disk ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_get-user-data =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_get-user-data (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_get-user-data (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/get-user-data.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/get-user-data +@@ -7,7 +7,7 @@ + # before script "run-user-script" + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + lib_triton_info "Retrieving metadata user-data" + $MDATA_GET user-data >/var/tmp/mdata-user-data.new Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_get-user-data ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-operator-script =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-operator-script (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-operator-script (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/run-operator-script.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/run-operator-script +@@ -3,7 +3,7 @@ + # Copyright (c) 2016 Joyent Inc., All rights reserved. + # + +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + lib_triton_info "Retrieving metadata operator-script..." + $MDATA_GET sdc:operator-script >/var/tmp/mdata-operator-script.new Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-operator-script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-user-script =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-user-script (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-user-script (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/run-user-script.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/run-user-script +@@ -10,7 +10,7 @@ + # This script is executed on each system boot + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + lib_triton_info "Retrieving metadata user-script..." + $MDATA_GET user-script >/var/tmp/mdata-user-script.new Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_run-user-script ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-hostname =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-hostname (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-hostname (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/set-hostname.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/set-hostname +@@ -4,7 +4,7 @@ + # Set the hostname of the VM if it's not already configured by the user. + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + grep hostname= /etc/rc.conf &>/dev/null + if [[ $? -ne 0 ]]; then Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-hostname ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-root-authorized-keys =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-root-authorized-keys (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-root-authorized-keys (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/set-root-authorized-keys.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/set-root-authorized-keys +@@ -7,7 +7,7 @@ + # By default this script is called on each boot + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + if [[ ! -f /root/.ssh/authorized_keys ]]; then + authorized_keys=$($MDATA_GET root_authorized_keys | awk '{ sub(/(ssh-rsa )/,"\n&"); print }' | awk '{ sub(/(ssh-dss )/,"\n&"); print }' 2>>/dev/console) Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-root-authorized-keys ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-rootpassword =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-rootpassword (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-rootpassword (revision 454294) @@ -0,0 +1,11 @@ +--- lib/smartdc/set-rootpassword.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/set-rootpassword +@@ -12,7 +12,7 @@ + # /etc/master.passwd to ensure a root password is not being overwritten. + + # load common functions and vars +-. /lib/smartdc/common.lib ++. %%PREFIX%%/lib/smartdc/common.lib + + # Check /etc/master.passwd. If root pass is set, exit so we don't clobber an + # already set password. Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_set-rootpassword ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_triton =================================================================== --- head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_triton (nonexistent) +++ head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_triton (revision 454294) @@ -0,0 +1,23 @@ +--- lib/smartdc/triton.orig 2017-05-22 19:41:07 UTC ++++ lib/smartdc/triton +@@ -13,12 +13,12 @@ export PS4='[\D{%FT%TZ}] ${BASH_SOURCE}:${LINENO}: ${F + export BASH_XTRACEFD=4 + set -o xtrace + +-(/lib/smartdc/add-network-interface) +-(/lib/smartdc/set-hostname) +-(/lib/smartdc/set-root-authorized-keys) +-if [ ! -f /lib/smartdc/.firstboot-complete-do-not-delete ] ; then +- (/lib/smartdc/firstboot) ++(%%PREFIX%%/lib/smartdc/add-network-interface) ++(%%PREFIX%%/lib/smartdc/set-hostname) ++(%%PREFIX%%/lib/smartdc/set-root-authorized-keys) ++if [ ! -f %%PREFIX%%/lib/smartdc/.firstboot-complete-do-not-delete ] ; then ++ (%%PREFIX%%/lib/smartdc/firstboot) + fi +-(/lib/smartdc/run-operator-script) +-(/lib/smartdc/get-user-data) +-(/lib/smartdc/run-user-script) ++(%%PREFIX%%/lib/smartdc/run-operator-script) ++(%%PREFIX%%/lib/smartdc/get-user-data) ++(%%PREFIX%%/lib/smartdc/run-user-script) Property changes on: head/net-mgmt/triton-guesttools/files/patch-lib_smartdc_triton ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/pkg-descr =================================================================== --- head/net-mgmt/triton-guesttools/pkg-descr (nonexistent) +++ head/net-mgmt/triton-guesttools/pkg-descr (revision 454294) @@ -0,0 +1,3 @@ +FreeBSD guest tools to enabled compatability with SmartOS and Triton. + +WWW: https://github.com/joyent/freebsd-kvm-image-builder/tree/master/triton-freebsd-guesttools Property changes on: head/net-mgmt/triton-guesttools/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/net-mgmt/triton-guesttools/pkg-plist =================================================================== --- head/net-mgmt/triton-guesttools/pkg-plist (nonexistent) +++ head/net-mgmt/triton-guesttools/pkg-plist (revision 454294) @@ -0,0 +1,12 @@ +etc/rc.d/triton +lib/smartdc/add-network-interface +lib/smartdc/common.lib +lib/smartdc/firstboot +lib/smartdc/format-secondary-disk +lib/smartdc/get-user-data +lib/smartdc/run-operator-script +lib/smartdc/run-user-script +lib/smartdc/set-hostname +lib/smartdc/set-root-authorized-keys +lib/smartdc/set-rootpassword +lib/smartdc/triton Property changes on: head/net-mgmt/triton-guesttools/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property