diff -Naur livecd.a/Makefile livecd.b/Makefile --- livecd.a/Makefile 2010-08-28 19:51:48.000000000 +0000 +++ livecd.b/Makefile 2010-08-28 21:11:28.000000000 +0000 @@ -26,6 +26,7 @@ $(INSTALL_PROGRAM) -D tools/image-creator $(DESTDIR)/usr/bin/image-creator $(INSTALL_PROGRAM) -D tools/livecd-iso-to-disk.sh $(DESTDIR)/usr/bin/livecd-iso-to-disk $(INSTALL_PROGRAM) -D tools/livecd-iso-to-pxeboot.sh $(DESTDIR)/usr/bin/livecd-iso-to-pxeboot + $(INSTALL_PROGRAM) -D tools/mkbiarch.py $(DESTDIR)/usr/bin/mkbiarch $(INSTALL_DATA) -D AUTHORS $(DESTDIR)/usr/share/doc/livecd-tools-$(VERSION)/AUTHORS $(INSTALL_DATA) -D COPYING $(DESTDIR)/usr/share/doc/livecd-tools-$(VERSION)/COPYING $(INSTALL_DATA) -D README $(DESTDIR)/usr/share/doc/livecd-tools-$(VERSION)/README @@ -41,6 +42,7 @@ rm -f $(DESTDIR)/usr/bin/livecd-creator rm -rf $(DESTDIR)/usr/lib/livecd-creator rm -rf $(DESTDIR)/usr/share/doc/livecd-tools-$(VERSION) + rm -f $(DESTDIR)/usr/bin/mkbiarch dist : all git archive --format=tar --prefix=livecd-tools-$(VERSION)/ HEAD | bzip2 -9v > livecd-tools-$(VERSION).tar.bz2 diff -Naur livecd.a/docs/mkbiarch.8 livecd.b/docs/mkbiarch.8 --- livecd.a/docs/mkbiarch.8 1970-01-01 00:00:00.000000000 +0000 +++ livecd.b/docs/mkbiarch.8 2010-08-28 21:12:05.000000000 +0000 @@ -0,0 +1,89 @@ +.\" PROCESS THIS FILE WITH +.\" groff -man -Tascii mkbiarch.8 +.\" +.TH mkbiarch 8 "2010-8-24" "LiveCD Tools" "User Manuals" + +.SH NAME +mkbiarch.py - make a multiple architecture Live boot disk image +for USB, CF SSD or any disk from 2 architecturally different +LiveCD ISO9660 image files. + +.SH SYNOPSIS +mkbiarch + +.SH DESCRIPTION +.B mkbiarch(8) +create a multiple architecture, bootable Live Disk image file (IMG) +for use on USB or any disk (CF, SSD) +from 2 LiveCD ISO9660 files of different architecture (ISO). +.BR + +.SH USAGE +.B mkbiarch.py +Fedora-13-i686-Live.iso +Fedora-13-x86_64-Live.iso +Fedora-13-MultiArch.img + +Then to write it +/bin/dd if=Fedora-13-MultiArch.img of=/dev/sdb bs=4M + +In the above example, mkbiarch.py +creates Fedora-Multi-arch.img +from the two existing ISO9660 LiveCD image files. +The resulting image file, +is written to a raw disk device using +.B dd(1) +.BR + + +.SH UNDER THE HOOD +.B mkbiarch.py(8) +first checks that the two ISO9660 image files exist. It will create a blank +file using dd(1) writing data from /dev/zero, the size of the two ISO9660 images files combined. +The blank file is then bound via loopback using +.B losetup(8) +partitioned, and bound at an offset via loopback +of 512 bytes, this second loopback device is formatted type ext3 using +.B mke2fs(8) +This filesystem is mounted using +.B mount(8) +on a temporary directory. The two ISO9660 files are then mounted via loopback, +files are copied using shutil module in Python, from them to the newly formatted +filesystem in the image file. Data is gathered from the ISO9660 image files from it's isolinux.cfg, +after the files are copied the loopbacked ISO9660 image files are released. +.B extlinux(1) +is installed to the loopback mounted filesystem on the target image file and an extlinux.conf +is written. The temporary directories are unmounted using +.B umount(8) +and the looback devices are released. +The temporary directories are then removed, and the resulting Multiple Architecture Disk Image +File is moved using shutil to the specified location on the command line, which is provided as +argument 3 to mkbiarch.py + +.SH BUGS +Please report any bugs to +http://bugzilla.redhat.com +under component livecd-tools + +.SH AVAILABILITY +To check out the git version of this program + git clone git://git.fedorahosted.org/livecd + +.SH AUTHOR +Jasper Hartline + +.SH CONTRIBUTORS +.B Richard Shaw +pyparted suggestions and feedback + +.B Jan Kratochvil +for the original bash script which +the python version was derived + +.SH "SEE ALSO" +.BR livecd-creator(8), +.BR livecd-iso-to-disk(8), +.BR mke2fs(8), +.BR losetup(8), +.BR dd(1), +.BR exlinux(1) diff -Naur livecd.a/tools/mkbiarch.py livecd.b/tools/mkbiarch.py --- livecd.a/tools/mkbiarch.py 1970-01-01 00:00:00.000000000 +0000 +++ livecd.b/tools/mkbiarch.py 2010-08-28 21:12:20.000000000 +0000 @@ -0,0 +1,305 @@ +#!/usr/bin/python +import os +import sys + +import shutil +import parted +import subprocess +import optparse +import tempfile +import re +import optparse + +def nothing(): + print >> sys.stdout, "Nothing" + +def main(): + + + def usage(): + usage = 'usage: mkbiarch.py ' + print >> sys.stdout, usage + + + def mount(src, dst, options=None): + if os.path.exists(src): + if not os.path.exists(dst): + os.makedir(dst) + if options is None: + args = ("/bin/mount", src, dst) + else: + args = ("/bin/mount", options, src, dst) + rc = subprocess.call(args) + return rc + return + + + def umount(src): + if os.path.exists(src): + args = ("/bin/umount", src) + rc = subprocess.call(args) + return rc + return + + + def copy(src, dst): + if os.path.exists(src): + if not os.path.exists(dst): + if not os.path.isfile(src): + mkdir(dst) + shutil.copy(src, dst) + + + def move(src, dst): + if os.path.exists(src): + shutil.move(src, dst) + + def mkdir(dir=None): + if dir is None: + tmp = tempfile.mkdtemp() + return tmp + else: + args = ("/bin/mkdir", "-p", dir) + rc = subprocess.call(args) + + + def losetup(src, dst, offset=None): + if os.path.exists(src): + if os.path.exists(dst): + if offset is None: + args = ("/sbin/losetup", src, dst) + else: + args = ("/sbin/losetup", "-o", str(offset), src, dst) + rc = subprocess.call(args) + return rc + + def lounset(device): + args = ("/sbin/losetup", "-d", device) + rc = subprocess.call(args) + + def null(): + fd = open(os.devnull, 'w') + return fd + + def dd(file, target): + args = ("/bin/dd", "if=%s"%file, "of=%s"%target) + rc = subprocess.call(args) + + def lo(): + args = ("/sbin/losetup", "--find") + rc = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0].rstrip() + return rc + + def lodev(file): + args = ("/sbin/losetup", "-j", file) + rc = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0].split(":") + return rc[0] + + + def mkimage(bs, count): + tmp = tempfile.mkstemp() + image = tmp[1] + args = ("/bin/dd", "if=/dev/zero", + "of=%s"%image, "bs=%s"%bs, + "count=%s"%count) + rc = subprocess.call(args) + return image + + + def size(ent): + if os.path.exists(ent): + return os.stat(ent).st_size + + def bs(size): + return size / 2048 + + def partition(device): + dev = parted.Device(path=device) + disk = parted.freshDisk(dev, 'msdos') + constraint = parted.Constraint(device=dev) + + new_geom = parted.Geometry(device=dev, + start=1, + end=(constraint.maxSize - 1)) + filesystem = parted.FileSystem(type="ext2", + geometry=new_geom) + partition = parted.Partition(disk=disk, + fs=filesystem, + type=parted.PARTITION_NORMAL, + geometry=new_geom) + partition.setFlag(parted.PARTITION_BOOT) + disk.addPartition(partition=partition, + constraint=constraint) + + disk.commit() + + def format(partition): + args = ("/sbin/mke2fs", "-j", partition) + rc = subprocess.call(args) + + def mbr(target): + mbr = "/usr/share/syslinux/mbr.bin" + dd(mbr, target) + + def getuuid(device): + args = ("/sbin/blkid", "-s", "UUID", "-o", "value", device) + rc = subprocess.Popen(args, stdout=subprocess.PIPE).communicate()[0].rstrip() + return rc + + def syslinux(multitmp, config, **args): + arg = ("/sbin/extlinux", "--install", multitmp + "/extlinux/") + rc = subprocess.call(arg) + + content = """ + default vesamenu.c32 + timeout 100 + + menu background splash.jpg + menu title Welcome to Fedora 13 + menu color border 0 #ffffffff #00000000 + menu color sel 7 #ffffffff #ff000000 + menu color title 0 #ffffffff #00000000 + menu color tabmsg 0 #ffffffff #00000000 + menu color unsel 0 #ffffffff #00000000 + menu color hotsel 0 #ff000000 #ffffffff + menu color hotkey 7 #ffffffff #ff000000 + menu color timeout_msg 0 #ffffffff #00000000 + menu color timeout 0 #ffffffff #00000000 + menu color cmdline 0 #ffffffff #00000000 + menu hidden + menu hiddenrow 5 + + label Fedora-13-x86 + menu label Fedora-13-x86 + kernel vmlinuz0 + append initrd=initrd0.img root=UUID=%(uuid)s rootfstype=auto ro live_dir=/x86/LiveOS liveimg + + label Fedora-13-x64 + menu label Fedora-13-x64 + kernel vmlinuz1 + append initrd=initrd1.img root=UUID=%(uuid)s rootfstype=auto ro live_dir=/x64/LiveOS liveimg + """ % args + fd = open(config, 'w') + fd.write(content) + fd.close() + + def verify(): + # use md5 module to verify image files + pass + + def setup(x86, x64, multi): + + sz = size(x86) + size(x64) + count = bs(sz) + blsz = str(2048) + + count = count + 102400 + + multi = mkimage(blsz, count) + losetup(lo(), multi) + + mbr(lodev(multi)) + partition(lodev(multi)) + + lounset(lodev(multi)) + + losetup(lo(), multi, offset=512) + format(lodev(multi)) + + multitmp = mkdir() + mount(lodev(multi), multitmp) + + losetup(lo(), x86) + losetup(lo(), x64) + + x86tmp = mkdir() + x64tmp = mkdir() + + mount(lodev(x86), x86tmp) + mount(lodev(x64), x64tmp) + + + dirs = ("/extlinux/", "/x86/", "/x64/") + for dir in dirs: + mkdir(multitmp + dir) + dirs = ("/x86/", "/x64/") + for dir in dirs: + mkdir(multitmp + dir + "/LiveOS/") + + intermediate = tempfile.mkdtemp() # loopdev performance is slow + # copy to here first then back + # to multitmp + dir which is looback also + + imgs = ("squashfs.img", "osmin.img") + for img in imgs: + copy(x86tmp + "/LiveOS/" + img, intermediate) + copy(intermediate + "/" + img, multitmp + "/x86/LiveOS/") + for img in imgs: + copy(x64tmp + "/LiveOS/" + img, intermediate) + copy(intermediate + "/" + img, multitmp + "/x64/LiveOS/") + + for file in os.listdir(x86tmp + "/isolinux/"): + copy(x86tmp + "/isolinux/" + file, multitmp + "/extlinux/") + + copy(x64tmp + "/isolinux/vmlinuz0", multitmp + "/extlinux/vmlinuz1") + copy(x64tmp + "/isolinux/initrd0.img", multitmp + "/extlinux/initrd1.img") + + + + uuid = getuuid(lodev(multi)) + + + config = (multitmp + "/extlinux/extlinux.conf") + syslinux(multitmp, + config, + uuid=uuid) + + + + umount(x86tmp) + umount(x64tmp) + umount(multitmp) + + lounset(lodev(x86)) + lounset(lodev(x64)) + lounset(lodev(multi)) + + shutil.rmtree(x86tmp) + shutil.rmtree(x64tmp) + shutil.rmtree(multitmp) + shutil.rmtree(intermediate) + + + + if os.path.exists(sys.argv[3]): + os.unlink(sys.argv[3]) + move(multi, sys.argv[3]) + + + def parse(x86, x64, multi): + for file in x86, x64: + if os.path.exists(file): + pass + else: + usage() + if not multi: + usage() + setup(x86, x64, multi) + + + + + + try: + parse(sys.argv[1], sys.argv[2], sys.argv[3]) + except: + usage() + + + + + + + +if __name__ == "__main__": + sys.exit(main())