Compare commits
31 Commits
Author | SHA1 | Date |
---|---|---|
Brian C. Lane | d14c98ffc2 | |
Brian C. Lane | bec48c40a0 | |
Brian C. Lane | 8bc26c6fed | |
Brian C. Lane | d20abcc1ce | |
Brian C. Lane | 0e83fcd825 | |
Brian C. Lane | 67860ee6b2 | |
Brian C. Lane | 2005f09e47 | |
Brian C. Lane | f0f5a081d3 | |
Brian C. Lane | a8eb0b5d18 | |
Seth Vidal | 5b4379174d | |
Brian C. Lane | 148c86f978 | |
Brian C. Lane | 18ab0b7d11 | |
Brian C. Lane | 24ef9aca30 | |
Brian C. Lane | 9898eb0290 | |
Brian C. Lane | 352f2deae2 | |
Brian C. Lane | 2db1fc0887 | |
Brian C. Lane | f39573f3ca | |
Bruno Wolff III | 65594863dd | |
Bruno Wolff III | 22ae9ad86c | |
Fedora Release Engineering | 105563ce84 | |
Fedora Release Engineering | e8fc910419 | |
Jesse Keating | 3152b9e877 | |
Jesse Keating | ee15b37805 | |
Bill Nottingham | 57d08617ec | |
Jesse Keating | 2a90473e01 | |
Warren Togami | bec3f0e420 | |
Warren Togami | 73a30b9fd1 | |
Warren Togami | 8e2aad7b90 | |
Warren Togami | cc973c670e | |
Warren Togami | fec9a4b60a | |
Jesse Keating | b5609cdf46 |
|
@ -1,20 +1,10 @@
|
|||
/livecd-tools-21.0.tar.bz2
|
||||
/livecd-tools-21.1.tar.bz2
|
||||
/livecd-tools-21.2.tar.bz2
|
||||
/livecd-tools-21.3.tar.bz2
|
||||
/livecd-tools-21.4.tar.bz2
|
||||
/livecd-tools-23.0.tar.bz2
|
||||
/livecd-tools-23.1.tar.gz
|
||||
/livecd-tools-23.2.tar.gz
|
||||
/livecd-tools-23.3.tar.gz
|
||||
/livecd-tools-23.4.tar.gz
|
||||
/livecd-tools-24.0.tar.gz
|
||||
/livecd-tools-24.1.tar.gz
|
||||
/livecd-tools-24.2.tar.gz
|
||||
/livecd-tools-24.3.tar.gz
|
||||
/livecd-tools-24.4.tar.gz
|
||||
/livecd-tools-25.0.tar.gz
|
||||
/livecd-tools-26.0.tar.gz
|
||||
/livecd-tools-26.1.tar.gz
|
||||
/livecd-tools-27.0.tar.gz
|
||||
/livecd-tools-27.1.tar.gz
|
||||
/livecd-tools-13.2.tar.bz2
|
||||
/livecd-tools-13.3.tar.bz2
|
||||
/livecd-tools-13.4.tar.bz2
|
||||
/livecd-tools-13.4.4.tar.bz2
|
||||
/livecd-tools-13.4.5.tar.bz2
|
||||
/livecd-tools-13.4.6.tar.bz2
|
||||
/livecd-tools-13.4.7.tar.bz2
|
||||
/livecd-tools-13.4.8.tar.bz2
|
||||
/livecd-tools-13.4.9.tar.bz2
|
||||
/livecd-tools-13.4.10.tar.bz2
|
||||
|
|
|
@ -0,0 +1,58 @@
|
|||
diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod
|
||||
index 880ae19..e80a119 100644
|
||||
--- a/docs/livecd-creator.pod
|
||||
+++ b/docs/livecd-creator.pod
|
||||
@@ -42,8 +42,8 @@ Defines the file system label. The default is based on the configuration name.
|
||||
|
||||
=item --compression-type=COMPRESSOR
|
||||
|
||||
-Specify a compressor recognized by mksquashfs. The default is zlib. lzma
|
||||
-currently requires a custom kernel to produce a functional image. If zlib
|
||||
+Specify a compressor recognized by mksquashfs. The default is gzip. lzma
|
||||
+currently requires a custom kernel to produce a functional image. If gzip
|
||||
is used, the -comp option is not passed to mksquashfs to allow the use of
|
||||
older versions of mksquashfs.
|
||||
|
||||
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
|
||||
index c5cd18b..554d1b9 100644
|
||||
--- a/imgcreate/fs.py
|
||||
+++ b/imgcreate/fs.py
|
||||
@@ -41,8 +41,8 @@ def makedirs(dirname):
|
||||
raise
|
||||
|
||||
def mksquashfs(in_img, out_img, compress_type):
|
||||
-# Allow zlib to work for older versions of mksquashfs
|
||||
- if compress_type == "zlib":
|
||||
+# Allow gzip to work for older versions of mksquashfs
|
||||
+ if compress_type == "gzip":
|
||||
args = ["/sbin/mksquashfs", in_img, out_img]
|
||||
else:
|
||||
args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type]
|
||||
diff --git a/imgcreate/live.py b/imgcreate/live.py
|
||||
index 36fef63..f349a1f 100644
|
||||
--- a/imgcreate/live.py
|
||||
+++ b/imgcreate/live.py
|
||||
@@ -46,7 +46,7 @@ class LiveImageCreatorBase(LoopImageCreator):
|
||||
"""
|
||||
LoopImageCreator.__init__(self, *args)
|
||||
|
||||
- self.compress_type = "zlib"
|
||||
+ self.compress_type = "gzip"
|
||||
"""mksquashfs compressor to use."""
|
||||
|
||||
self.skip_compression = False
|
||||
diff --git a/tools/livecd-creator b/tools/livecd-creator
|
||||
index 79fc944..d1727c5 100755
|
||||
--- a/tools/livecd-creator
|
||||
+++ b/tools/livecd-creator
|
||||
@@ -42,8 +42,8 @@ def parse_options(args):
|
||||
imgopt.add_option("-f", "--fslabel", type="string", dest="fs_label",
|
||||
help="File system label (default based on config name)")
|
||||
imgopt.add_option("", "--compression-type", type="string", dest="compress_type",
|
||||
- help="Compression type recognized by mksquashfs (default zlib, lzma needs custom kernel)",
|
||||
- default="zlib")
|
||||
+ help="Compression type recognized by mksquashfs (default gzip, lzma needs custom kernel)",
|
||||
+ default="gzip")
|
||||
parser.add_option_group(imgopt)
|
||||
|
||||
# options related to the config of your system
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,27 @@
|
|||
From 9c1868bf39af0d23d58e3aa184345de810443310 Mon Sep 17 00:00:00 2001
|
||||
From: "Brian C. Lane" <bcl@redhat.com>
|
||||
Date: Fri, 2 May 2014 15:54:42 -0700
|
||||
Subject: [PATCH] fix firewalls being reset when setting selinux state from
|
||||
imgcreate
|
||||
|
||||
Move the patch for this from pkg-git into upstream.
|
||||
---
|
||||
imgcreate/kickstart.py | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/imgcreate/kickstart.py b/imgcreate/kickstart.py
|
||||
index 04191b8..f50a9b8 100644
|
||||
--- a/imgcreate/kickstart.py
|
||||
+++ b/imgcreate/kickstart.py
|
||||
@@ -175,7 +175,7 @@ class FirewallConfig(KickstartConfig):
|
||||
def apply(self, ksfirewall):
|
||||
if not os.path.exists(self.path("/usr/sbin/lokkit")):
|
||||
return
|
||||
- args = ["/usr/sbin/lokkit", "-f", "--quiet", "--nostart"]
|
||||
+ args = ["/usr/sbin/lokkit", "--quiet", "--nostart"]
|
||||
if ksfirewall.enabled:
|
||||
args.append("--enabled")
|
||||
|
||||
--
|
||||
1.9.0
|
||||
|
Loading…
Reference in New Issue