Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ svn diff nanobsd/ build/
- Index: nanobsd/freenas-common
- ===================================================================
- --- nanobsd/freenas-common (revision 10228)
- +++ nanobsd/freenas-common (working copy)
- @@ -482,6 +482,62 @@
- }
- customize_cmd configure_pbi_manager
- +# Beware of dog. A lot of the stuff done here is done in such a way
- +# that it doesn't require changes to nanobsd.sh, etc.
- +create_portsjail()
- +{
- + local jail_obj_dir jail_world_dir
- +
- + jail_obj_dir="$AVATAR_ROOT/obj.$NANO_ARCH/_.pjobj"
- + jail_world_dir="$AVATAR_ROOT/obj.$NANO_ARCH/_.pjw"
- +
- + nanobsd_vars="MAKEOBJDIRPREFIX NANO_MAKE_CONF_BUILD NANO_MAKE_CONF_INSTALL NANO_OBJ NANO_WORLDDIR"
- +
- + # Save the old values
- + for nanobsd_var in $nanobsd_vars
- + do
- + local "old_${nanobsd_var}"
- + eval "old_${nanobsd_var}='\${$nanobsd_var}'"
- + done
- +
- + export MAKEOBJDIRPREFIX="$jail_obj_dir"
- + export NANO_MAKE_CONF_BUILD="$AVATAR_ROOT/examples/plugins/make.conf"
- + export NANO_MAKE_CONF_INSTALL="$AVATAR_ROOT/examples/plugins/make.conf"
- + export NANO_OBJ="$jail_obj_dir"
- + export NANO_WORLDDIR=$jail_world_dir
- +
- + # XXX: do something smarter here, like svn status $NANO_SRC, generate a
- + # checksum, profit from not having to recompile stuff..
- + clean_build
- +
- + # Build the jailed world.
- + build_world
- +
- + # Create/install a PBI jailed world.
- + install_world
- + install_etc
- +
- + cat > "$jail_world_dir/etc/rc.conf" <<EOF
- +sendmail_enable="NONE"
- +syslogd_flags="-ss"
- +pbid_enable="YES"
- +sshd_enable="YES"
- +EOF
- +
- + # TODO: install magic ports here required for all PBIs.
- + # examples/plugins/jail_ports.sh doesn't seem to reflect the
- + # exact requirements (too heavyweight)..
- +
- +
- + # Restore the old values
- + for nanobsd_var in $nanobsd_vars
- + do
- + eval "${nanobsd_var}='\${old_$nanobsd_var}'"
- + done
- +
- +}
- +customize_cmd create_portsjail
- +
- if [ "${DEBUG}" = 1 ]; then
- unmute_console_logging()
- @@ -632,6 +688,7 @@
- local cd_image_log
- local full_image full_image_log
- local gui_upgrade gui_upgrade_image_log
- + local jail_world_dir
- cd_image_log="${MAKEOBJDIRPREFIX}/_.cd_iso"
- full_image_log="${MAKEOBJDIRPREFIX}/_.full_image"
- @@ -679,5 +736,14 @@
- fi
- + set -x
- + pbi_create \
- + -a \
- + -n $NANO_IMGNAME.Plugins_Jail \
- + -o "$NANO_DISKIMGDIR" \
- + -r "$(echo $VERSION | sed -E -e 's/-[^-]+//g')" \
- + -w $AVATAR_PROJECT_SITE \
- + $jail_world_dir \
- +
- }
- fi # $do_image
- Index: build/nano_env
- ===================================================================
- --- build/nano_env (revision 10228)
- +++ build/nano_env (working copy)
- @@ -10,6 +10,9 @@
- # The FreeNAS source and build tree is rooted here.
- : ${AVATAR_ROOT=$(pwd)}
- +# The website for this avatar project.
- +: ${AVATAR_PROJECT_SITE=http://www.freenas.org}
- +
- # The support site for this avatar project.
- : ${AVATAR_SUPPORT_SITE=http://support.freenas.org}
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement