[Pkg-libvirt-commits] [libguestfs] 24/87: builder: Fix documentation for --attach option.

[Hilko Bengen]

This is an automated email from the git hooks/post-receive script.

bengen pushed a commit to branch debian
in repository libguestfs.

commit f212ee2b82a5139c9638b748265858a497464afc
Author: Richard W.M. Jones <rjones at redhat.com>
Date:   Mon Jan 13 19:25:34 2014 +0000

    builder: Fix documentation for --attach option.
    
    (cherry picked from commit 5fa55389d4a84a942010f8a77d305bc134deacf2)
---
 builder/virt-builder.pod | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/builder/virt-builder.pod b/builder/virt-builder.pod
index f0f06fe..22f8a3f 100644
--- a/builder/virt-builder.pod
+++ b/builder/virt-builder.pod
@@ -191,7 +191,7 @@ disk format (not just an ISO).
 
 See also: I<--run>,
 L</Installing packages at build time from a side repository>,
-L<virt-make-fs(1)>.
+L<genisoimage(1)>, L<virt-make-fs(1)>.
 
 =item B<--attach-format> FORMAT
 
@@ -602,12 +602,15 @@ package repository of the guest, then you can add a side repository.
 Usually this is presented as an ISO (CD disk image) file containing
 extra packages.
 
+You can create the disk image using either L<genisoimage(1)> or
+L<virt-make-fs(1)>.  For genisoimage, use a command like this:
+
+ genisoimage -o extra-packages.iso -R -J -V EXTRA cdcontents/
+
 Create a script that mounts the ISO and sets up the repository.  For
 yum, create /tmp/install.sh containing:
 
  mkdir /tmp/mount
- 
- # Assume the volume label of the CD is 'EXTRA':
  mount LABEL=EXTRA /tmp/mount
  
  cat <<'EOF' > /etc/yum.repos.d/extra.repo
@@ -622,16 +625,17 @@ yum, create /tmp/install.sh containing:
 For apt, create /tmp/install.sh containing:
 
  mkdir /tmp/mount
- 
- # Assume the volume label of the CD is 'EXTRA':
  mount LABEL=EXTRA /tmp/mount
  
  apt-cdrom -d=/tmp/mount add
  apt-get -y install famousdatabase
 
-Use the I<--attach> option to attach the CD:
+Use the I<--attach> option to attach the CD / disk image and the
+I<--run> option to run the script:
 
- virt-builder fedora 20 --attach extra.iso --run /tmp/install.sh
+ virt-builder fedora-20 \
+   --attach extra-packages.iso \
+   --run /tmp/install.sh
 
 =head2 USERS AND PASSWORDS
 
@@ -1325,6 +1329,8 @@ L<virt-sysprep(1)>,
 L<oz-install(1)>,
 L<gpg(1)>,
 L<curl(1)>,
+L<virt-make-fs(1)>,
+L<genisoimage(1)>,
 L<http://libguestfs.org/>.
 
 =head1 AUTHOR

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/libguestfs.git