Neal Gompa
8 years ago
parent
b235ba4d4e
commit
3c27a74c27
@ -1,25 +0,0 @@
|
|||||||
From 4004c87d935712cdafe0e1319387d55e651b7703 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Neal Gompa <ngompa13@gmail.com>
|
|
||||||
Date: Fri, 2 Dec 2016 08:52:11 -0500
|
|
||||||
Subject: [PATCH] Fix import for compatibility with livecd-tools v24
|
|
||||||
|
|
||||||
---
|
|
||||||
appcreate/__init__.py | 2 +-
|
|
||||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
||||||
|
|
||||||
diff --git a/appcreate/__init__.py b/appcreate/__init__.py
|
|
||||||
index 4bed653..0c4cebf 100644
|
|
||||||
--- a/appcreate/__init__.py
|
|
||||||
+++ b/appcreate/__init__.py
|
|
||||||
@@ -19,7 +19,7 @@
|
|
||||||
|
|
||||||
from imgcreate.live import *
|
|
||||||
from imgcreate.creator import *
|
|
||||||
-from imgcreate.yuminst import *
|
|
||||||
+from imgcreate.dnfinst import *
|
|
||||||
from imgcreate.kickstart import *
|
|
||||||
from imgcreate.fs import *
|
|
||||||
from imgcreate.debug import *
|
|
||||||
--
|
|
||||||
2.9.3 (Apple Git-75)
|
|
||||||
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
diff --git a/tools/appliance-creator b/tools/appliance-creator
|
|
||||||
index c5f75f2..1708431 100755
|
|
||||||
--- a/tools/appliance-creator
|
|
||||||
+++ b/tools/appliance-creator
|
|
||||||
@@ -160,7 +160,14 @@ def main():
|
|
||||||
|
|
||||||
return 0
|
|
||||||
|
|
||||||
+def do_nss_sss_hack():
|
|
||||||
+ import ctypes as forgettable
|
|
||||||
+ hack = forgettable._dlopen('libnss_sss.so.2')
|
|
||||||
+ del forgettable
|
|
||||||
+ return hack
|
|
||||||
+
|
|
||||||
if __name__ == "__main__":
|
|
||||||
+ hack = do_nss_sss_hack()
|
|
||||||
sys.exit(main())
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,31 +0,0 @@
|
|||||||
--- appliance-tools-007.8/appcreate/partitionedfs.py.orig 2016-09-20 12:42:15.950885273 +0100
|
|
||||||
+++ appliance-tools-007.8/appcreate/partitionedfs.py 2016-09-20 12:42:25.905888013 +0100
|
|
||||||
@@ -77,7 +77,7 @@
|
|
||||||
|
|
||||||
d = self.disks[p['disk']]
|
|
||||||
d['numpart'] += 1
|
|
||||||
- if d['numpart'] > 3 and self.partition_layout == 'msdos':
|
|
||||||
+ if d['numpart'] > 4 and self.partition_layout == 'msdos':
|
|
||||||
# Increase allocation of extended partition to hold this partition
|
|
||||||
d['extended'] += p['size']
|
|
||||||
p['type'] = 'logical'
|
|
||||||
@@ -106,6 +106,8 @@
|
|
||||||
logging.debug("Add %s part at %d of size %d" % (p['type'], p['start'], p['size']))
|
|
||||||
if p['fstype'].startswith('ext'):
|
|
||||||
fstype = 'ext2'
|
|
||||||
+ if p['fstype'].startswith('swap'):
|
|
||||||
+ fstype = 'linux-swap'
|
|
||||||
if p['fstype'] == 'vfat':
|
|
||||||
fstype = 'fat32'
|
|
||||||
rc = subprocess.call(["/sbin/parted", "-a", "opt", "-s", d['disk'].device, "mkpart",
|
|
||||||
@@ -264,6 +266,10 @@
|
|
||||||
p['UUID'] = self.__getuuid(p['device'])
|
|
||||||
continue
|
|
||||||
|
|
||||||
+ if mp == '/boot':
|
|
||||||
+ # mark the partition bootable
|
|
||||||
+ subprocess.call(["/sbin/parted", "-s", self.disks[p['disk']]['disk'].device, "set", str(p['num']), "boot", "on"])
|
|
||||||
+
|
|
||||||
if mp == 'biosboot':
|
|
||||||
subprocess.call(["/sbin/parted", "-s", self.disks[p['disk']]['disk'].device, "set", "1", "bios_grub", "on"])
|
|
||||||
continue
|
|
||||||
Loading…
Reference in new issue