From c4968f42fc320c13f433e7a73054e8b449b7cfa5 Mon Sep 17 00:00:00 2001
From: Renato Botelho <renato@netgate.com>
Date: Tue, 1 Sep 2015 10:33:41 -0300
Subject: Create a specific default-config package for vmware

---
 tools/builder_common.sh                                   | 10 ++++++++++
 .../core_pkg/default-config-vmware/metadir/+DESC          |  3 +++
 .../core_pkg/default-config-vmware/metadir/+INSTALL       | 15 +++++++++++++++
 .../core_pkg/default-config-vmware/metadir/+MANIFEST      | 15 +++++++++++++++
 tools/templates/core_pkg/default-config-vmware/pkg-plist  |  1 +
 5 files changed, 44 insertions(+)
 create mode 100644 tools/templates/core_pkg/default-config-vmware/metadir/+DESC
 create mode 100644 tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL
 create mode 100644 tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST
 create mode 100644 tools/templates/core_pkg/default-config-vmware/pkg-plist

(limited to 'tools')

diff --git a/tools/builder_common.sh b/tools/builder_common.sh
index f50bc9e..f676558 100644
--- a/tools/builder_common.sh
+++ b/tools/builder_common.sh
@@ -1027,6 +1027,14 @@ clone_to_staging_area() {
 	core_pkg_create default-config "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
 
 	local DEFAULTCONF=${STAGE_CHROOT_DIR}/conf.default/config.xml
+
+	# Change default interface names to match vmware driver
+	sed -i '' -e 's,em0,vmx0,' -e 's,em1,vmx1,' ${DEFAULTCONF}
+	core_pkg_create default-config-vmware "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR}
+
+	# Restore default values to be used by serial package
+	sed -i '' -e 's,vmx0,em0,' -e 's,vmx1,em1,' ${DEFAULTCONF}
+
 	# Activate serial console in config.xml
 	# If it was there before, clear the setting to be sure we don't add it twice.
 	sed -i "" -e "/		<enableserial\/>/d" ${DEFAULTCONF}
@@ -1088,6 +1096,8 @@ customize_stagearea_for_image() {
 	     "${1}" = "memstickserial" -o \
 	     "${1}" = "memstickadi" ]; then
 		pkg_chroot_add ${FINAL_CHROOT_DIR} default-config-serial
+	elif [ "${1}" = "ova" ]; then
+		pkg_chroot_add ${FINAL_CHROOT_DIR} default-config-vmware
 	else
 		pkg_chroot_add ${FINAL_CHROOT_DIR} default-config
 	fi
diff --git a/tools/templates/core_pkg/default-config-vmware/metadir/+DESC b/tools/templates/core_pkg/default-config-vmware/metadir/+DESC
new file mode 100644
index 0000000..d732511
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-vmware/metadir/+DESC
@@ -0,0 +1,3 @@
+%%PRODUCT_NAME%% default config (vmware)
+
+WWW: %%PRODUCT_URL%%
diff --git a/tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL b/tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL
new file mode 100644
index 0000000..11c69cd
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-vmware/metadir/+INSTALL
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+if [ "${2}" != "POST-INSTALL" ]; then
+	exit 0
+fi
+
+if [ ! -f /cf/conf/config.xml ]; then
+	cp /conf.default/config.xml /cf/conf/config.xml
+fi
+
+if [ ! -L /conf ]; then
+	ln -sf /cf/conf /conf
+fi
+
+exit 0
diff --git a/tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST b/tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST
new file mode 100644
index 0000000..56c2604
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-vmware/metadir/+MANIFEST
@@ -0,0 +1,15 @@
+name: "%%PRODUCT_NAME%%-default-config"
+version: "%%VERSION%%"
+origin: "security/%%PRODUCT_NAME%%-default-config"
+comment: <<EOD
+%%PRODUCT_NAME%% default config (vmware)
+EOD
+maintainer: development@pfsense.org
+prefix: /
+deps: {
+
+}
+categories [ security,  ]
+licenselogic: single
+licenses: [ BSD2CLAUSE,  ]
+options: {  }
diff --git a/tools/templates/core_pkg/default-config-vmware/pkg-plist b/tools/templates/core_pkg/default-config-vmware/pkg-plist
new file mode 100644
index 0000000..b6fe8df
--- /dev/null
+++ b/tools/templates/core_pkg/default-config-vmware/pkg-plist
@@ -0,0 +1 @@
+/conf.default/config.xml
-- 
cgit v1.1