[multiboot-media-creator/testing: 46/46] Merge branch 'python-development' into testing
by Dave Riches
commit 8e4495c00b49a79c7bf03d6d722ba39ec45dbe33
Merge: 62422a7... 9b780ad...
Author: Dave Riches <dcr226(a)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
12 years
[multiboot-media-creator/testing] (46 commits) ...Merge branch 'python-development' into testing
by Dave Riches
Summary of changes:
d714c5c... started python development (*)
03f20f7... added list isos in path (*)
6c2e592... now creates the required directories in /tmp (*)
a5fca00... added mount/umount functions (*)
f900bb4... Added License Header (*)
b3e8fbb... refactored mount/umount and makedirs(). Added mount_and_ste (*)
eac8c69... Merge branch 'python-development' of ssh://git.fedorahosted (*)
ac03bfb... Cleaned up imports (*)
776d5c6... Added version info (*)
8be9008... added my email address (*)
508dd09... Merge branch 'python-development' of ssh://git.fedorahosted (*)
3a53765... added my email address (*)
ea17710... added my email address (*)
f146214... I'm now confused (*)
a00a2ac... I'm still confused (*)
cec6be3... my email address (*)
79a78da... Fixed email addresses (*)
d8f1b60... refactored the functions, added test function, removed defa (*)
c48fe67... added iso-creating function, and appended it to mount_and_s (*)
d543540... getisos() now has the ability to determine the type of iso. (*)
b6aae46... refactoring and added build_filesystem() (*)
daa8399... remove mount_and_steal, not needed anymore (*)
d66e123... builds filesystem for both lives and dvds, creates iso. Thi (*)
0b073d7... added rescue options for dvd media (*)
c628fa2... added gtimeout argument to create_grub(). Its optional, def (*)
9ba8a0e... added cli options for directory and usb device (*)
b714070... changed options to -s (source directory) -d (destination de (*)
6f8214f... added 'justdoit' test run for experimental use, and made en (*)
35d3413... Who knows what this was (*)
b3bc235... Merge branch 'python-development' of ssh://git.fedorahosted (*)
b35251a... symlinked mmc and made it run directly, no need for python (*)
8525071... forgot to add the symlink (*)
4a9dc49... fixed -s / --source (*)
95433cc... minor bugfix (*)
3cbc624... rsync, because bob won't let it go (*)
f72b094... made rsync optional with -r or --rsync (*)
daffb61... added exception handling to mountiso() and makedirs() (*)
00ff5b9... added exception handling to grub_install() (*)
891dfdf... added check_device() , checks to see if the device is alrea (*)
61187cb... converted to grub2, untested (*)
bbe20ca... changed readme (*)
6f90648... mkdirs typo (*)
5976c8e... Script completes as prescribed, start to finish. run with - (*)
7d3d84c... made -q --quiet work. Added a couple of deps to README for (*)
9b780ad... fixed wrongly reported device during grub installation (*)
8e4495c... Merge branch 'python-development' into testing
(*) This commit already existed in another branch; no separate mail sent
12 years