Makefile | 2 +-
imgcreate/kickstart.py | 3 ++-
tools/edit-livecd | 14 --------------
3 files changed, 3 insertions(+), 16 deletions(-)
New commits:
commit 673b12fc5411c2db2b53f3a7e7660f85ae1627eb
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Fri May 2 15:17:32 2014 -0700
Version 13.4.6
diff --git a/Makefile b/Makefile
index 7946173..2bb3fcf 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 13.4.5
+VERSION = 13.4.6
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
commit 4ae89e618118ef2b26d59cc93d074bb0005481ca
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Fri May 2 15:07:44 2014 -0700
edit-livecd: Remove rebuild_iso_symlinks (#928620)
There is no need to modify any of these files, just leave them as-is
from the original image.
Resolved: rhbz#928620
diff --git a/tools/edit-livecd b/tools/edit-livecd
index 163589c..673da89 100755
--- a/tools/edit-livecd
+++ b/tools/edit-livecd
@@ -630,19 +630,6 @@ def get_fsvalue(filesystem, tag):
return fs_type.rstrip()
-def rebuild_iso_symlinks(isodir):
- # remove duplicate files and rebuild symlinks to reduce iso size
- efi_vmlinuz = "%s/EFI/BOOT/vmlinuz0" % isodir
- isolinux_vmlinuz = "%s/isolinux/vmlinuz0" % isodir
- efi_initrd = "%s/EFI/BOOT/initrd0.img" % isodir
- isolinux_initrd = "%s/isolinux/initrd0.img" % isodir
-
- if os.path.exists(efi_vmlinuz):
- os.remove(efi_vmlinuz)
- os.remove(efi_initrd)
- os.symlink(isolinux_vmlinuz,efi_vmlinuz)
- os.symlink(isolinux_initrd,efi_initrd)
-
def main():
# LiveOS set to <LIVEIMG.src>
(LiveOS, options) = parse_options(sys.argv[1:])
@@ -699,7 +686,6 @@ def main():
print "Launching shell. Exit to continue."
print "----------------------------------"
editor.launch_shell()
- rebuild_iso_symlinks(editor._LiveImageCreatorBase__isodir)
editor.unmount()
editor.package(output)
logging.info("%s.iso saved to %s" % (editor.name, output))
commit 732095480dd179482af21b953eebebb35ad950f9
Author: Brian C. Lane <bcl(a)redhat.com>
Date: Wed Jan 23 15:50:45 2013 -0800
correctly check for selinux state (#896610)
The check for selinux_enabled was incorrect. selinux is enabled
when in enforcing or permissive mode.
Resolves: rhbz#896610
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
index 4abba6b..04191b8 100644
--- a/imgcreate/kickstart.py
+++ b/imgcreate/kickstart.py
@@ -564,4 +564,5 @@ def get_post_scripts(ks):
return scripts
def selinux_enabled(ks):
- return ks.handler.selinux.selinux == ksconstants.SELINUX_ENFORCING
+ return ks.handler.selinux.selinux in (ksconstants.SELINUX_ENFORCING,
+ ksconstants.SELINUX_PERMISSIVE)