Permalink
Browse files

Bump version, added lsof, reworked zoneinit

  • Loading branch information...
1 parent c11fbed commit e4f1d2a6184b75cbe181ba6aaec552afebcc8615 @mamash mamash committed Nov 19, 2012
Showing with 16 additions and 10 deletions.
  1. +11 −6 smtools/Makefile
  2. +5 −4 smtools/PLIST
View
@@ -18,18 +18,18 @@ NO_CHECKSUM= yes
NO_BUILD= yes
WRKSRC= ${WRKDIR}/smtools
-VERSION= 20121030
+VERSION= 20121115
.include "../../mk/bsd.prefs.mk"
SM_SCRIPTS= cpuinfo create-db create-dbuser create-vhost \
install-drupal install-wordpress list-dbs \
- list-dbusers list-timezones meminfo pcp pkghelp \
+ list-dbusers list-timezones meminfo pkghelp \
prepare-image reboot rebuild-pkgsrc remove-db \
remove-dbuser set-hostname set-timezone \
- shutdown summary
-ZONEINIT_INCS= 00-init.sh 00-mdata.sh 01-reboot-file.sh \
- 03-dupipcheck.sh 03-ips.sh 04-mdata.sh \
+ shutdown summary lsof
+ZONEINIT_INCS= 00-mdata.sh 01-reboot-file.sh 02-config.sh \
+ 04-mdata.sh \
11-files.sh 12-network.sh 91-passwords.sh \
92-sshd.sh 93-pkgsrc.sh 999-cleanup.sh
PKGIN_HELPERS= apt-get apt-cache pkg port rpm yum
@@ -44,7 +44,7 @@ PLATFORM= sdc5
INSTALLATION_DIRS+= bin lib/zoneinit lib/zoneinit/includes
SUBST_CLASSES+= vars
-SUBST_STAGE.vars= post-extract
+SUBST_STAGE.vars= post-patch
SUBST_MESSAGE.vars= Configuring scripts
SUBST_FILES.vars= sm-prepare-image sm-rebuild-pkgsrc zoneinit/zoneinit.xml
SUBST_VARS.vars= PREFIX VARBASE PLATFORM PKGRELEASE MACHINE_ARCH
@@ -63,10 +63,15 @@ do-install:
. for helper in ${PKGIN_HELPERS}
${LN} -s sm-pkghelp ${DESTDIR}${PREFIX}/bin/${helper}
. endfor
+ ${LN} -s sm-lsof ${DESTDIR}${PREFIX}/bin/lsof
${INSTALL_SCRIPT} ${WRKSRC}/zoneinit/zoneinit \
${DESTDIR}${PREFIX}/lib/zoneinit
${INSTALL_DATA} ${WRKSRC}/zoneinit/zoneinit.xml \
${DESTDIR}${PREFIX}/lib/zoneinit
+ ${INSTALL_SCRIPT} ${WRKSRC}/zoneinit/mdata \
+ ${DESTDIR}${PREFIX}/lib/zoneinit
+ ${INSTALL_DATA} ${WRKSRC}/zoneinit/mdata.xml \
+ ${DESTDIR}${PREFIX}/lib/zoneinit
. for include in ${ZONEINIT_INCS}
${INSTALL_DATA} ${WRKSRC}/zoneinit/includes/${include} \
${DESTDIR}${PREFIX}/lib/zoneinit/includes
View
@@ -1,6 +1,7 @@
@comment $NetBSD$
bin/apt-cache
bin/apt-get
+bin/lsof
bin/pkg
bin/port
bin/rpm
@@ -13,8 +14,8 @@ bin/sm-install-wordpress
bin/sm-list-dbs
bin/sm-list-dbusers
bin/sm-list-timezones
+bin/sm-lsof
bin/sm-meminfo
-bin/sm-pcp
bin/sm-pkghelp
bin/sm-prepare-image
bin/sm-reboot
@@ -26,17 +27,17 @@ bin/sm-set-timezone
bin/sm-shutdown
bin/sm-summary
bin/yum
-lib/zoneinit/includes/00-init.sh
lib/zoneinit/includes/00-mdata.sh
lib/zoneinit/includes/01-reboot-file.sh
-lib/zoneinit/includes/03-dupipcheck.sh
-lib/zoneinit/includes/03-ips.sh
+lib/zoneinit/includes/02-config.sh
lib/zoneinit/includes/04-mdata.sh
lib/zoneinit/includes/11-files.sh
lib/zoneinit/includes/12-network.sh
lib/zoneinit/includes/91-passwords.sh
lib/zoneinit/includes/92-sshd.sh
lib/zoneinit/includes/93-pkgsrc.sh
lib/zoneinit/includes/999-cleanup.sh
+lib/zoneinit/mdata
+lib/zoneinit/mdata.xml
lib/zoneinit/zoneinit
lib/zoneinit/zoneinit.xml

0 comments on commit e4f1d2a

Please sign in to comment.