>From da41ecc33586ff4a76afeb5cfe9040c6f7068606 Mon Sep 17 00:00:00 2001 From: Richard W.M. Jones Date: Thu, 22 Sep 2011 16:58:21 +0100 Subject: [PATCH] Replace mkisofs with genisoimage. Note that on Fedora, mkisofs is a symlink (indirectly) to genisoimage, so one must presume that the command line arguments are precisely compatible. --- oz.spec.in | 2 +- oz/Debian.py | 2 +- oz/OpenSUSE.py | 2 +- oz/RedHat.py | 2 +- oz/Ubuntu.py | 2 +- oz/Windows.py | 8 +++++--- 6 files changed, 10 insertions(+), 8 deletions(-) diff --git a/oz.spec.in b/oz.spec.in index 9d528b8..2df91c1 100644 --- a/oz.spec.in +++ b/oz.spec.in @@ -18,7 +18,7 @@ Requires: libvirt-python # unless/until we are able to make it really be remote. Requires: libvirt Requires: python-pycurl -Requires: mkisofs +Requires: genisoimage Requires: numpy Requires: mtools Requires: python-uuid diff --git a/oz/Debian.py b/oz/Debian.py index 28d03ce..8140135 100644 --- a/oz/Debian.py +++ b/oz/Debian.py @@ -75,7 +75,7 @@ class DebianGuest(oz.Guest.CDGuest): Method to create a new ISO based on the modified CD/DVD. """ self.log.info("Generating new ISO") - oz.ozutil.subprocess_check_output(["mkisofs", "-r", "-V", "Custom", + oz.ozutil.subprocess_check_output(["genisoimage", "-r", "-V", "Custom", "-J", "-l", "-no-emul-boot", "-b", "isolinux/isolinux.bin", "-c", "isolinux/boot.cat", diff --git a/oz/OpenSUSE.py b/oz/OpenSUSE.py index 155171a..c7a5e26 100644 --- a/oz/OpenSUSE.py +++ b/oz/OpenSUSE.py @@ -87,7 +87,7 @@ class OpenSUSEGuest(oz.Guest.CDGuest): Method to create a new ISO based on the modified CD/DVD. """ self.log.info("Generating new ISO") - oz.ozutil.subprocess_check_output(["mkisofs", "-r", "-V", "Custom", + oz.ozutil.subprocess_check_output(["genisoimage", "-r", "-V", "Custom", "-J", "-no-emul-boot", "-b", "boot/" + self.tdl.arch + "/loader/isolinux.bin", "-c", "boot/" + self.tdl.arch + "/loader/boot.cat", diff --git a/oz/RedHat.py b/oz/RedHat.py index 6e3f0ec..001b86e 100644 --- a/oz/RedHat.py +++ b/oz/RedHat.py @@ -83,7 +83,7 @@ Subsystem sftp /usr/libexec/openssh/sftp-server Method to create a new ISO based on the modified CD/DVD. """ self.log.debug("Generating new ISO") - oz.ozutil.subprocess_check_output(["mkisofs", "-r", "-T", "-J", + oz.ozutil.subprocess_check_output(["genisoimage", "-r", "-T", "-J", "-V", "Custom", "-no-emul-boot", "-b", "isolinux/isolinux.bin", "-c", "isolinux/boot.cat", diff --git a/oz/Ubuntu.py b/oz/Ubuntu.py index bf98977..26fee88 100644 --- a/oz/Ubuntu.py +++ b/oz/Ubuntu.py @@ -105,7 +105,7 @@ class UbuntuGuest(oz.Guest.CDGuest): Method to create a new ISO based on the modified CD/DVD. """ self.log.info("Generating new ISO") - oz.ozutil.subprocess_check_output(["mkisofs", "-r", "-V", "Custom", + oz.ozutil.subprocess_check_output(["genisoimage", "-r", "-V", "Custom", "-J", "-l", "-no-emul-boot", "-b", "isolinux/isolinux.bin", "-c", "isolinux/boot.cat", diff --git a/oz/Windows.py b/oz/Windows.py index a389642..2141219 100644 --- a/oz/Windows.py +++ b/oz/Windows.py @@ -58,7 +58,8 @@ class Windows2000andXPand2003(Windows): Method to create a new ISO based on the modified CD/DVD. """ self.log.debug("Generating new ISO") - oz.ozutil.subprocess_check_output(["mkisofs", "-b", "cdboot/boot.bin", + oz.ozutil.subprocess_check_output(["genisoimage", + "-b", "cdboot/boot.bin", "-no-emul-boot", "-boot-load-seg", "1984", "-boot-load-size", "4", "-iso-level", "2", "-J", "-l", "-D", @@ -166,9 +167,10 @@ class Windows2008and7(Windows): Method to create a new ISO based on the modified CD/DVD. """ self.log.debug("Generating new ISO") - # NOTE: Windows 2008 is very picky about which arguments to mkisofs + # NOTE: Windows 2008 is very picky about which arguments to genisoimage # will generate a bootable CD, so modify these at your own risk - oz.ozutil.subprocess_check_output(["mkisofs", "-b", "cdboot/boot.bin", + oz.ozutil.subprocess_check_output(["genisoimage", + "-b", "cdboot/boot.bin", "-no-emul-boot", "-c", "BOOT.CAT", "-iso-level", "2", "-J", "-l", "-D", "-N", "-joliet-long", -- 1.7.2.5