From 8a24000e9c2f3db53c0298936a095503f564b123 Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Thu, 1 Jan 1970 00:00:00 +0000 Subject: [PATCH] Rename 'update-iso.ml' as more happenin' 'iso-attach'. --- MANIFEST | 2 +- Makefile | 4 ++-- update-iso.ml => iso-attach | 39 ++++++++++++++++++++++++++------------- 3 files changed, 29 insertions(+), 16 deletions(-) rename update-iso.ml => iso-attach (90%) diff --git a/MANIFEST b/MANIFEST index bc9fec2..27e3daf 100644 --- a/MANIFEST +++ b/MANIFEST @@ -2,6 +2,7 @@ COPYING .cvsignore .hgignore inittab +iso-attach livecd.ks.in livecd-post.sh.in lvm.conf @@ -9,5 +10,4 @@ Makefile MANIFEST README README.developers -update-iso.ml virt-p2v.ml diff --git a/Makefile b/Makefile index f2df2a6..bd944e2 100644 --- a/Makefile +++ b/Makefile @@ -103,8 +103,8 @@ boot: # Update an existing ISO. update: checkroot checkscript - -./update-iso.ml delete $(ISO) - ./update-iso.ml add $(ISO) virt-p2v.ml + -./iso-attach delete $(ISO) + ./iso-attach add $(ISO) virt-p2v.ml # Check that we are root. diff --git a/update-iso.ml b/iso-attach similarity index 90% rename from update-iso.ml rename to iso-attach index c50c755..55bcd3e 100755 --- a/update-iso.ml +++ b/iso-attach @@ -1,7 +1,6 @@ #!/usr/bin/ocamlrun /usr/bin/ocaml -#load "unix.cma";; - -(* update-iso.ml attaches an updated 'virt-p2v.ml' file to the end of +(* -*- tuareg -*- *) +(* iso-attach attaches an updated 'virt-p2v.ml' file to the end of * an ISO image. This is just for quick developer builds because it * takes ages to rebuild a full ISO. * @@ -23,6 +22,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA *) +#load "unix.cma";; + open Printf open Unix @@ -90,19 +91,31 @@ let rec main () = do_has isoname | _ -> eprintf "\ -update-iso.ml add foo.iso file - Attach 'file' to 'foo.iso'. +NAME + + iso-attach - Attach files to CD-ROM ISO images. + +SYNOPSIS + + iso-attach add foo.iso file + Attach 'file' to 'foo.iso'. + + iso-attach delete foo.iso + Remove attachment (if any) from 'foo.iso'. + + iso-attach get foo.iso file + Get attachment from 'foo.iso' and save it as 'file'. -update-iso.ml delete foo.iso - Remove attachment (if any) from 'foo.iso'. + iso-attach has foo.iso + Exit with 0 (true) if there is an attachment. + Exit with 1 (false) if there is no attachment. + Exit with 2 if there was some other error, eg. file not found. -update-iso.ml get foo.iso file - Get attachment from 'foo.iso' and save it as 'file'. +DESCRIPTION -update-iso.ml has foo.iso - Exit with 0 (true) if there is an attachment. - Exit with 1 (false) if there is no attachment. - Exit with 2 if there was some other error, eg. file not found. +iso-attach attaches an updated 'virt-p2v.ml' file to the end of +an ISO image. This is just for quick developer builds because it +takes ages to rebuild a full ISO. Note that attachments are stacked, so you can add more than one attachment. In this case 'get' operation returns the most recently -- 1.8.3.1