2 commits - Makefile tools/livecd-creator
by Brian C. Lane
Makefile | 2 +-
tools/livecd-creator | 7 +++++++
2 files changed, 8 insertions(+), 1 deletion(-)
New commits:
commit 4dcf44f852072c60abb6547f973c8bfc5af71694
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Tue Oct 21 12:11:48 2014 -0700
Preload the libnss_sss library (#1127103)
This is a total hack, but in order to make sure the library is loaded
from the build host and not from the target chroot we need to do this.
This also means that the spec needs to Require: sssd-client
diff --git a/tools/livecd-creator b/tools/livecd-creator
index ac81cbb..f761d14 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -225,5 +225,12 @@ 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())
commit 3cb6d9577b0b1da16c3a69a777e791fef35db892
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Mon Oct 20 10:01:14 2014 -0700
Version 21.3
diff --git a/Makefile b/Makefile
index 78de9cf..8925df1 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 21.2
+VERSION = 21.3
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
9 years, 6 months
imgcreate/live.py
by Brian C. Lane
imgcreate/live.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 8fd9cab483a40aada8f979c9783961bd3659e750
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Fri Oct 17 10:17:06 2014 -0700
mkefiboot now expects all upper case for BOOT*.EFI (#1154138)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 1001c86..260fc61 100755
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -717,7 +717,7 @@ menu end
"""
fail = False
missing = []
- files = [("/boot/efi/EFI/*/shim.efi", "/EFI/BOOT/BOOT%s.efi" % (self.efiarch,)),
+ files = [("/boot/efi/EFI/*/shim.efi", "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch,)),
("/boot/efi/EFI/*/gcdx64.efi", "/EFI/BOOT/grubx64.efi"),
("/boot/efi/EFI/*/fonts/unicode.pf2", "/EFI/BOOT/fonts/"),
]
@@ -822,8 +822,8 @@ submenu 'Troubleshooting -->' {
# first gen mactel machines get the bootloader name wrong apparently
if rpmUtils.arch.getBaseArch() == "i386":
- os.link(isodir + "/EFI/BOOT/BOOT%s.efi" % (self.efiarch),
- isodir + "/EFI/BOOT/BOOT.efi")
+ os.link(isodir + "/EFI/BOOT/BOOT%s.EFI" % (self.efiarch),
+ isodir + "/EFI/BOOT/BOOT.EFI")
def _configure_bootloader(self, isodir):
9 years, 6 months
imgcreate/creator.py
by Brian C. Lane
imgcreate/creator.py | 40 ++++++++++++++++++++--------------------
1 file changed, 20 insertions(+), 20 deletions(-)
New commits:
commit 6f8389953fced1da76e4f5576767ab27fe1228b8
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Fri Oct 10 09:13:47 2014 -0700
Move __fstype into ImageCreator class
_write_fstab needs to have it set so it makes more sense to have it in
the base class.
diff --git a/imgcreate/creator.py b/imgcreate/creator.py
index 42faf6f..a06f3df 100644
--- a/imgcreate/creator.py
+++ b/imgcreate/creator.py
@@ -87,6 +87,7 @@ class ImageCreator(object):
self.__builddir = None
self.__bindmounts = []
+ self.__fstype = kickstart.get_image_fstype(self.ks, "ext3")
self.__sanity_check()
@@ -138,6 +139,24 @@ class ImageCreator(object):
"""
+ def __get_fstype(self):
+ return self.__fstype
+ def __set_fstype(self, val):
+ if val not in ("ext2", "ext3", "ext4"):
+ raise CreatorError("Unknown _fstype '%s' supplied" % val)
+ self.__fstype = val
+ _fstype = property(__get_fstype, __set_fstype)
+ """The type of filesystem used for the image.
+
+ This is the filesystem type used when creating the filesystem image.
+ Subclasses may change this if they wish to use something other ext3.
+
+ Note, only ext2, ext3, ext4 are currently supported.
+
+ Note also, this attribute may only be set before calling mount().
+
+ """
+
#
# Hooks for subclasses
#
@@ -802,7 +821,6 @@ class LoopImageCreator(ImageCreator):
self.__minsize_KB = 0
self.__blocksize = 4096
- self.__fstype = kickstart.get_image_fstype(self.ks, "ext3")
self.__instloop = None
self.__imgdir = None
@@ -872,24 +890,6 @@ class LoopImageCreator(ImageCreator):
"""
- def __get_fstype(self):
- return self.__fstype
- def __set_fstype(self, val):
- if val not in ("ext2", "ext3", "ext4"):
- raise CreatorError("Unknown _fstype '%s' supplied" % val)
- self.__fstype = val
- _fstype = property(__get_fstype, __set_fstype)
- """The type of filesystem used for the image.
-
- This is the filesystem type used when creating the filesystem image.
- Subclasses may change this if they wish to use something other ext3.
-
- Note, only ext2, ext3, ext4 are currently supported.
-
- Note also, this attribute may only be set before calling mount().
-
- """
-
#
# Helpers for subclasses
#
@@ -927,7 +927,7 @@ class LoopImageCreator(ImageCreator):
self.__instloop = ExtDiskMount(SparseLoopbackDisk(self._image,
self.__image_size),
self._instroot,
- self.__fstype,
+ self._fstype,
self.__blocksize,
self.fslabel,
self.tmpdir)
9 years, 6 months
tools/livecd-creator
by Brian C. Lane
tools/livecd-creator | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 7c279fc42655201fcb9c3591956491f98d162d83
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Thu Oct 9 13:54:43 2014 -0700
Catch Yum errors and print them (#1119906)
diff --git a/tools/livecd-creator b/tools/livecd-creator
index 34533c1..ac81cbb 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -23,6 +23,7 @@ import sys
import time
import optparse
import logging
+from yum.Errors import YumBaseError
import imgcreate
@@ -216,7 +217,7 @@ def main():
creator.launch_shell()
creator.unmount()
creator.package()
- except imgcreate.CreatorError, e:
+ except (imgcreate.CreatorError, YumBaseError) as e:
logging.error(u"Error creating Live CD : %s" % e)
return 1
finally:
9 years, 6 months
need advice on stick
by ToddAndMargo
Hi All,
I am going to propose I put together either a Live USB
or a whole distro installed to a USB. All depends
on which one will allow me to do a full LUKS encryption.
Any words of wisdom?
Many thanks,
-T
9 years, 6 months
