commit 8e4495c00b49a79c7bf03d6d722ba39ec45dbe33 Merge: 62422a7... 9b780ad... Author: Dave Riches dcr226@fedorapeople.org Date: Tue Mar 1 17:26:06 2011 +0000
Merge branch 'python-development' into testing
Conflicts: README
README | 11 ++ bin/multiboot-media-creator | 3 +- mmc | 1 + multiboot-media-creator.py | 231 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 244 insertions(+), 2 deletions(-) --- diff --cc README index 464d631,5ff7e50..1aa8e85 --- a/README +++ b/README @@@ -8,12 -8,11 +8,23 @@@ It will take all of the .iso files with
Usage:
++<<<<<<< HEAD +./multiboot-media-creator-0.1 + +the result should be a Multi-Boot.iso image which can then be used, as described above + +Dependencies: + +genisofs (more importantly mkisofs) +rsync +bash ++======= + The result should be a Multi-Boot.iso image which can then be used, as described above + + Requirements + + Python + pyparted + grub2 + **more coming soon** ++>>>>>>> python-development
multiboot-media-creator@lists.fedorahosted.org