diff options
| author | Renato Botelho <renato@netgate.com> | 2015-11-16 16:49:29 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2015-11-16 16:49:43 -0200 |
| commit | dab31392f9b80285c6d2e0c1d03b7b247939d653 (patch) | |
| tree | eed9cb20e03898dded2d1c9367aa42f51d18f5df | |
| parent | 16060c78acaebf12a533b8fdb1771df7b44e012f (diff) | |
| download | pfsense-dab31392f9b80285c6d2e0c1d03b7b247939d653.zip pfsense-dab31392f9b80285c6d2e0c1d03b7b247939d653.tar.gz | |
Create a new core pkg, pfSense-rc, that will install /etc/rc. Add this package to kernel list if dependencies to make sure it's upgraded before reboot. It should fix #5457
| -rw-r--r-- | tools/builder_common.sh | 3 | ||||
| -rw-r--r-- | tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST | 2 | ||||
| -rw-r--r-- | tools/templates/core_pkg/base/metadir/+MANIFEST | 2 | ||||
| -rw-r--r-- | tools/templates/core_pkg/kernel/metadir/+MANIFEST | 2 |
4 files changed, 6 insertions, 3 deletions
diff --git a/tools/builder_common.sh b/tools/builder_common.sh index e425d22..8292fde 100644 --- a/tools/builder_common.sh +++ b/tools/builder_common.sh @@ -1060,6 +1060,7 @@ clone_to_staging_area() { -X ${_exclude_files} \ . + core_pkg_create rc "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} core_pkg_create base "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} core_pkg_create base-nanobsd "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} core_pkg_create default-config "" ${CORE_PKG_VERSION} ${STAGE_CHROOT_DIR} @@ -1119,6 +1120,8 @@ customize_stagearea_for_image() { # Prepare final stage area create_final_staging_area + pkg_chroot_add ${FINAL_CHROOT_DIR} rc + if [ "${1}" = "nanobsd" -o \ "${1}" = "nanobsd-vga" ]; then diff --git a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST index f163b92..b1a31a7 100644 --- a/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST +++ b/tools/templates/core_pkg/base-nanobsd/metadir/+MANIFEST @@ -7,7 +7,7 @@ EOD maintainer: development@pfsense.org prefix: /usr/local deps: { - +"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"} } categories [ security, ] licenselogic: single diff --git a/tools/templates/core_pkg/base/metadir/+MANIFEST b/tools/templates/core_pkg/base/metadir/+MANIFEST index 94b2057..0f5ed85 100644 --- a/tools/templates/core_pkg/base/metadir/+MANIFEST +++ b/tools/templates/core_pkg/base/metadir/+MANIFEST @@ -7,7 +7,7 @@ EOD maintainer: development@pfsense.org prefix: /usr/local deps: { - +"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"} } categories [ security, ] licenselogic: single diff --git a/tools/templates/core_pkg/kernel/metadir/+MANIFEST b/tools/templates/core_pkg/kernel/metadir/+MANIFEST index 1770333..5c87a6a 100644 --- a/tools/templates/core_pkg/kernel/metadir/+MANIFEST +++ b/tools/templates/core_pkg/kernel/metadir/+MANIFEST @@ -7,7 +7,7 @@ EOD maintainer: development@pfsense.org prefix: / deps: { - +"%%PRODUCT_NAME%%-rc": {origin: "security/%%PRODUCT_NAME%%-rc", version: "%%VERSION%%"} } categories [ security, ] licenselogic: single |
