From 6bc7dc11bd16b78cfb5119c09f655bce2d186613 Mon Sep 17 00:00:00 2001 From: Andreas Monzner Date: Mon, 26 May 2014 14:54:53 +0200 Subject: [PATCH] enigma2: add missing patch --- ...-possible-crash-on-harddisk-re-init-.patch | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 meta-opendreambox/recipes-dreambox/enigma2/enigma2-3.999git20140314/0001-Hardisk.py-fixed-possible-crash-on-harddisk-re-init-.patch diff --git a/meta-opendreambox/recipes-dreambox/enigma2/enigma2-3.999git20140314/0001-Hardisk.py-fixed-possible-crash-on-harddisk-re-init-.patch b/meta-opendreambox/recipes-dreambox/enigma2/enigma2-3.999git20140314/0001-Hardisk.py-fixed-possible-crash-on-harddisk-re-init-.patch new file mode 100644 index 00000000..9ed98d44 --- /dev/null +++ b/meta-opendreambox/recipes-dreambox/enigma2/enigma2-3.999git20140314/0001-Hardisk.py-fixed-possible-crash-on-harddisk-re-init-.patch @@ -0,0 +1,35 @@ +From 3bc160c3807c344ba300a74e217733a974b7d67b Mon Sep 17 00:00:00 2001 +From: ghost +Date: Mon, 26 May 2014 14:39:36 +0200 +Subject: [PATCH] Hardisk.py: fixed possible crash on harddisk re-init, allow + fsck for ext4 (thx to jophi) + +--- + usr/lib/enigma2/python/Components/Harddisk.py | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/usr/lib/enigma2/python/Components/Harddisk.py b/usr/lib/enigma2/python/Components/Harddisk.py +index 6501800..cbe0f7f 100644 +--- a/usr/lib/enigma2/python/Components/Harddisk.py ++++ b/usr/lib/enigma2/python/Components/Harddisk.py +@@ -388,7 +388,7 @@ class Harddisk: + sectors = self.diskSize(sectors = True) + cmd = 'parted --script --align=min ' + self.disk_path + ' -- mklabel msdos mkpart primary ext3 40s 100%' + if sectors and not self.isRemovable: +- part1end = int(sectors-swapPartSize) #leaving 1GB for swap ++ part1end = int(sectors)-swapPartSize #leaving 1GB for swap + cmd = 'parted --script --align=min ' + self.disk_path + ' -- mklabel msdos mkpart primary ext3 40s ' + str(part1end) + 's' + cmd+= ' mkpart primary linux-swap ' + str(int(part1end+1)) + 's -1s' + if sectors > maxSectorsMBR: +@@ -474,7 +474,7 @@ class Harddisk: + + res = -1 + if access(partitionPath, 0): +- if partitionType in ("ext2", "ext3"): ++ if partitionType in ("ext2", "ext3", "ext4"): + cmd = "fsck." + partitionType + " -f -p -C 0 " + partitionPath + res = system(cmd) + +-- +1.7.7 + -- 2.20.1