svn commit: r258312 - in stable/9: release share/man/man7

[Glen Barber]

Author: gjb
Date: Mon Nov 18 17:03:11 2013
New Revision: 258312
URL: http://svnweb.freebsd.org/changeset/base/258312

Log:
  MFC r257805, r257806, r257807:
  
  r257805:
    Add a 'mini-memstick.img' release target, which will use the
    'bootonly.iso' components to create a smaller memory stick image.
  
    This is useful for system recovery, where a full memstick.img image
    is not necessarily needed (or wanted).  In addition, it is possible to
    do bootonly-style installation, where the base.txz, kernel.txz, etc.
    are fetched from a remote source.
  
    Provide backwards-compatible target (mini-memstick), to keep in sync
    with the targets documented in release/Makefile.
  
  r257806:
    Remove extra target from 'memstick' in r257805.
  
  r257807:
    Update release(7) to include 'mini-memstick' target.
  
  Sponsored by:	The FreeBSD Foundation

Modified:
  stable/9/release/Makefile
  stable/9/share/man/man7/release.7
Directory Properties:
  stable/9/release/   (props changed)
  stable/9/share/man/man7/   (props changed)

Modified: stable/9/release/Makefile
==============================================================================
--- stable/9/release/Makefile	Mon Nov 18 16:51:56 2013	(r258311)
+++ stable/9/release/Makefile	Mon Nov 18 17:03:11 2013	(r258312)
@@ -5,6 +5,7 @@
 # User-driven targets:
 #  cdrom: Builds release CD-ROM media (disc1.iso)
 #  memstick: Builds memory stick image (memstick.img)
+#  mini-memstick: Builds minimal memory stick image (mini-memstick.img)
 #  ftp: Sets up FTP distribution area (ftp)
 #  release: Build all media and FTP distribution area
 #  install: Copies all release media into ${DESTDIR}
@@ -74,7 +75,9 @@ IMAGES+=	disc1.iso bootonly.iso
 .endif
 .if exists(${.CURDIR}/${TARGET}/make-memstick.sh)
 RELEASE_TARGETS+= memstick.img
+RELEASE_TARGETS+= mini-memstick.img
 IMAGES+=	memstick.img
+IMAGES+=	mini-memstick.img
 .endif
 
 .include <bsd.obj.mk>
@@ -181,6 +184,10 @@ memstick: memstick.img
 memstick.img: system
 	sh ${.CURDIR}/${TARGET}/make-memstick.sh release ${.TARGET}
 
+mini-memstick: mini-memstick.img
+mini-memstick.img: system
+	sh ${.CURDIR}/${TARGET}/make-memstick.sh bootonly ${.TARGET}
+
 packagesystem: base.txz kernel.txz ${EXTRA_PACKAGES}
 	sh ${.CURDIR}/scripts/make-manifest.sh *.txz > MANIFEST
 	touch ${.TARGET}

Modified: stable/9/share/man/man7/release.7
==============================================================================
--- stable/9/share/man/man7/release.7	Mon Nov 18 16:51:56 2013	(r258311)
+++ stable/9/share/man/man7/release.7	Mon Nov 18 17:03:11 2013	(r258312)
@@ -24,7 +24,7 @@
 .\"
 .\" $FreeBSD$
 .\"
-.Dd January 31, 2013
+.Dd November 7, 2013
 .Dt RELEASE 7
 .Os
 .Sh NAME
@@ -175,6 +175,11 @@ Not applicable on all platforms. Require
 .Xr md 4
 (memory disk) device driver be present in the kernel
 (either by being compiled in or available as a module).
+.It Cm mini-memstick
+Similar to
+.Cm memstick ,
+with the exception that the installation distribution sets
+are not included.
 .It Cm ftp
 Creates a directory named
 .Pa ftp