summarylogtreecommitdiffstats
path: root/remove-ubuntu-version-check.patch
diff options
context:
space:
mode:
Diffstat (limited to 'remove-ubuntu-version-check.patch')
-rw-r--r--remove-ubuntu-version-check.patch61
1 files changed, 61 insertions, 0 deletions
diff --git a/remove-ubuntu-version-check.patch b/remove-ubuntu-version-check.patch
new file mode 100644
index 000000000000..1b16ccde2a29
--- /dev/null
+++ b/remove-ubuntu-version-check.patch
@@ -0,0 +1,61 @@
+diff -Naur usb-creator-0.2.59.orig/usbcreator/install.py usb-creator-0.2.59/usbcreator/install.py
+--- usb-creator-0.2.59.orig/usbcreator/install.py 2013-12-02 21:03:23.000000000 +0100
++++ usb-creator-0.2.59/usbcreator/install.py 2014-07-23 18:04:25.636786909 +0200
+@@ -198,31 +198,8 @@
+ if os.path.exists(ldlinux):
+ os.remove(ldlinux)
+
+- def os_vers(self):
+- """Return a tuple of the target OS version and our OS version."""
+- import lsb_release
+- try:
+- from debian import debian_support
+- except ImportError:
+- from debian_bundle import debian_support
+-
+- target_os_ver = None
+- our_os_ver = debian_support.Version(
+- lsb_release.get_distro_information()['RELEASE'])
+-
+- if os.path.exists(os.path.join(self.target, '.disk', 'info')):
+- with open(os.path.join(self.target, '.disk', 'info'),'r') as f:
+- contents = f.readline().split()
+- if len(contents) > 2:
+- # Consider point releases the same as the initial release
+- # (10.04.4 -> 10.04)
+- target_os_ver = debian_support.Version(contents[1])
+-
+- return target_os_ver, our_os_ver
+-
+ def need_syslinux_legacy(self):
+- target_os_ver, our_os_ver = self.os_vers()
+- return our_os_ver >= '10.10' and target_os_ver <= '10.04'
++ return False
+
+ def install_bootloader(self, grub_location=''):
+ logging.debug('install_bootloader')
+@@ -280,7 +257,6 @@
+ if os.path.basename(filename) == 'gfxboot.cfg':
+ continue
+ f = None
+- target_os_ver, our_os_ver = self.os_vers()
+ try:
+ f = open(filename, 'r')
+ label = ''
+@@ -298,16 +274,6 @@
+ line.insert(1, 'cdrom-detect/try-usb=true')
+ if label not in ('memtest', 'hd'):
+ line.insert(1, 'noprompt')
+- #OS version specific mangles
+- #The syntax in syslinux changed with the version
+- #shipping in Ubuntu 10.10
+- elif (target_os_ver and our_os_ver and
+- target_os_ver != our_os_ver):
+- #10.10 or newer image, burning on 10.04 or lower
+- if (command.lower() == 'ui' and
+- our_os_ver <= '10.04' and
+- target_os_ver >= '10.10'):
+- line.remove('ui')
+
+ to_write.append(' '.join(line) + '\n')
+ f.close()