]> CyberLeo.Net >> Repos - FreeBSD/releng/10.1.git/commit
MFstable10 r273198:
authorgjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 16 Oct 2014 23:25:38 +0000 (23:25 +0000)
committergjb <gjb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f>
Thu, 16 Oct 2014 23:25:38 +0000 (23:25 +0000)
commit80075767383c310e73cfcf1eb682bd3cc8475a20
tree48fed746d9af9a31a3b3930327c9c65ea5c06e9c
parent766479f4d6455734510859a0dc8c82910484eca0
MFstable10 r273198:
MFC r273093, r273096:

r273093:
  Merge the following from ^/projects/release-vmimage:
  r272436, r272437, r272792:

  r272436:
    Remove the first argument to panic(), which was initially
    intended to be the exit code, however when a non-zero exit
    code was returned to release/Makefile, this would prevent
    any remaining (and possibly successful) stages from being
    attempted.

  r272437:

    If the vm-base target fails, prevent the vm-image target
    from being run since it cannot possibly succeed.

  r272792:

    Add /usr/local/bin and /usr/local/sbin to PATH, needed
    if third-party software needs to use utilities outside
    of the base system during post-install stages (indexinfo
    is one culprit).

r273096:
  Merge the following from ^/projects/release-vmimage:
  r273076, r273077, r273079, r273095:

  r273076:
    Add a separate make(1) target to release/Makefile to
    build FreeBSD virtual machine disk images for use on
    the Microsoft Azure service.

    For now, this target is not directly connected to the
    build, however can be manually invoked.

    The 'vm-azure' target invokes {amd64,i386}/mk-azure.sh,
    which does the heavy lifting to produce proper VHDs.
    mk-azure.sh uses a configuration file, defaulting to
    tools/azure.conf if otherwise unset.

  r273077:
    Clear VM_RC_LIST.

  r273079:
    Fix signal list to trigger umount(8).

  r273095:
    Output an informational message when mkimg(1) runs, so it
    does not appear that the process has stopped while waiting
    for a 'y/n' response when waagent is deprovisioned.

Relnotes: yes
Approved by: re (delphij)
Sponsored by: The FreeBSD Foundation

git-svn-id: svn://svn.freebsd.org/base/releng/10.1@273199 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
release/Makefile
release/amd64/mk-azure.sh [new file with mode: 0755]
release/amd64/mk-vmimage.sh
release/i386/mk-azure.sh [new file with mode: 0755]
release/i386/mk-vmimage.sh
release/tools/azure.conf [new file with mode: 0644]