Makefile
by Bruno Wolff III
Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 9eb92898e3ea9a34a0fa1b0e0bb30ab50c4133da
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 19 13:38:19 2010 -0500
Need to update version in Makefile
diff --git a/Makefile b/Makefile
index 341d0ca..868ea20 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
-VERSION = 031
+VERSION = 032
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
13 years, 10 months
Changes to 'refs/tags/livecd-tools-032'
by Bruno Wolff III
Changes since livecd-tools-031:
Alan Pevec (2):
livecd-iso-to-disk --format fails with existing LV on USB
livecd-creator ignores device directive
Bastien Nocera (2):
Update the root label for EFI as well
Document the --efi command-line argument
Bernie Innocenti (1):
LANG=C when parted output is being scraped, as localized strings cause it to fail.
Bruno Wolff III (2):
Support for specifying a compressor.
Add Douglas McClendon to the AUTHORS file, as the man page says he's an author.
Colin Walters (2):
Add tools/liveimage-mount
Rename --proc to --mount-hacks, strip whitespace
Daniel Drake (1):
Implement %post --erroronfail
Jim Meyering (1):
livecd-iso-to-disk.sh: use LC_ALL=C, not LANG=C, since LC_ALL trumps all other envvars, including LANG. For example,
Joey Boggs (3):
add rd_NO_DM dracut cmdline options bz: 589783
add edit-livecd
prepend _ to the file system label.
Lubomir Rintel (2):
This reverts commit 5f42d465badfc2b172e0bb10a2c0d2a27a164d27.
Aside from mkinitrd, create equivalent dracut configuration as well.
---
AUTHORS | 1
Makefile | 1
docs/livecd-creator.pod | 7
docs/livecd-iso-to-disk.pod | 8 -
imgcreate/creator.py | 11 +
imgcreate/fs.py | 14 +
imgcreate/live.py | 69 +++++---
tools/edit-livecd | 350 ++++++++++++++++++++++++++++++++++++++++++++
tools/livecd-creator | 4
tools/livecd-iso-to-disk.sh | 23 ++
tools/liveimage-mount | 101 ++++++++++++
11 files changed, 552 insertions(+), 37 deletions(-)
---
13 years, 10 months
AUTHORS
by Bruno Wolff III
AUTHORS | 1 +
1 file changed, 1 insertion(+)
New commits:
commit e225d595337727df145f6d0f02fd1c14726348a7
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 19 12:09:27 2010 -0500
Add Douglas McClendon to the AUTHORS file, as the man page says he's an author.
diff --git a/AUTHORS b/AUTHORS
index 3f81144..6f70bcc 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,2 +1,3 @@
David Zeuthen <david(a)fubar.dk>
Jeremy Katz <katzj(a)redhat.com>
+Douglas McClendon
13 years, 10 months
docs/livecd-creator.pod imgcreate/fs.py imgcreate/live.py tools/livecd-creator
by Bruno Wolff III
docs/livecd-creator.pod | 7 +++++++
imgcreate/fs.py | 12 ++++++++----
imgcreate/live.py | 8 ++++++--
tools/livecd-creator | 4 ++++
4 files changed, 25 insertions(+), 6 deletions(-)
New commits:
commit c7c5bbbae768788de3bcc7089d369a45a89cda97
Author: Bruno Wolff III <bruno(a)wolff.to>
Date: Sat Jun 19 12:07:50 2010 -0500
Support for specifying a compressor.
diff --git a/docs/livecd-creator.pod b/docs/livecd-creator.pod
index b275e65..880ae19 100644
--- a/docs/livecd-creator.pod
+++ b/docs/livecd-creator.pod
@@ -40,6 +40,13 @@ Add packages to an existing live CD iso9660 image.
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
+is used, the -comp option is not passed to mksquashfs to allow the use of
+older versions of mksquashfs.
+
=back
=head1 SYSTEM DIRECTORY OPTIONS
diff --git a/imgcreate/fs.py b/imgcreate/fs.py
index f5eed39..142ecd2 100644
--- a/imgcreate/fs.py
+++ b/imgcreate/fs.py
@@ -40,8 +40,12 @@ def makedirs(dirname):
if err != errno.EEXIST:
raise
-def mksquashfs(in_img, out_img):
- args = ["/sbin/mksquashfs", in_img, out_img]
+def mksquashfs(in_img, out_img, compress_type):
+# Allow zlib to work for older versions of mksquashfs
+ if compress_type == "zlib":
+ args = ["/sbin/mksquashfs", in_img, out_img]
+ else:
+ args = ["/sbin/mksquashfs", in_img, out_img, "-comp", compress_type]
if not sys.stdout.isatty():
args.append("-no-progress")
@@ -553,7 +557,7 @@ class DeviceMapperSnapshot(object):
except ValueError:
raise SnapshotError("Failed to parse dmsetup status: " + out)
-def create_image_minimizer(path, image, target_size = None):
+def create_image_minimizer(path, image, compress_type, target_size = None):
"""
Builds a copy-on-write image which can be used to
create a device-mapper snapshot of an image where
@@ -591,7 +595,7 @@ def create_image_minimizer(path, image, target_size = None):
cowloop.truncate(cow_used)
- mksquashfs(cowloop.lofile, path)
+ mksquashfs(cowloop.lofile, path, compress_type)
os.unlink(cowloop.lofile)
diff --git a/imgcreate/live.py b/imgcreate/live.py
index 856cce8..4f3bdd3 100644
--- a/imgcreate/live.py
+++ b/imgcreate/live.py
@@ -46,6 +46,9 @@ class LiveImageCreatorBase(LoopImageCreator):
"""
LoopImageCreator.__init__(self, *args)
+ self.compress_type = "zlib"
+ """mksquashfs compressor to use."""
+
self.skip_compression = False
"""Controls whether to use squashfs to compress the image."""
@@ -294,7 +297,7 @@ class LiveImageCreatorBase(LoopImageCreator):
self._resparse()
if not self.skip_minimize:
- create_image_minimizer(self.__isodir + "/LiveOS/osmin.img", self._image)
+ create_image_minimizer(self.__isodir + "/LiveOS/osmin.img", self._image, self.compress_type)
if self.skip_compression:
shutil.move(self._image, self.__isodir + "/LiveOS/ext3fs.img")
@@ -307,7 +310,8 @@ class LiveImageCreatorBase(LoopImageCreator):
os.path.join(os.path.dirname(self._image),
"LiveOS", "ext3fs.img"))
mksquashfs(os.path.dirname(self._image),
- self.__isodir + "/LiveOS/squashfs.img")
+ self.__isodir + "/LiveOS/squashfs.img",
+ self.compress_type)
if os.stat(self.__isodir + "/LiveOS/squashfs.img").st_size >= 4*1024*1024*1024:
self._isofstype = "udf"
logging.warn("Switching to UDF due to size of LiveOS/squashfs.img")
diff --git a/tools/livecd-creator b/tools/livecd-creator
index 39f7478..79fc944 100755
--- a/tools/livecd-creator
+++ b/tools/livecd-creator
@@ -41,6 +41,9 @@ def parse_options(args):
help="Add packages to an existing live CD iso9660 image.")
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")
parser.add_option_group(imgopt)
# options related to the config of your system
@@ -113,6 +116,7 @@ def main():
creator = imgcreate.LiveImageCreator(ks, name, fs_label)
creator.tmpdir = os.path.abspath(options.tmpdir)
+ creator.compress_type = options.compress_type
creator.skip_compression = options.skip_compression
creator.skip_minimize = options.skip_minimize
if options.cachedir:
13 years, 10 months
livecd-tools documentation reference to AUTHORS file
by Bruno Wolff III
In the livecd-tools documentation there is a list of authors followed by:
See the AUTHORS file in the source distribution for the complete list of
credits.
However the AUTHORS file lists less people than what is in the documentation.
I'll add the extra people listed by name by the documentation into AUTHORS to
sort of fix this.
Eventually something else should probably be done.
13 years, 10 months
Getting a new build in rawhide
by Bruno Wolff III
I am looking at getting a new build in rawhide so we can start getting testing
using the nightly builds.
My initial thoughts are to wait for approval (possibly after some reworking
if requested) of the compression type patch and then make a new build using
the master branch.
Does this seem OK?
Are there other patches that are almost ready that it would be nice to wait
for?
Is there any reason we wouldn't want to use some of the stuff in the master
branch?
Would it make sense to branch or tage 032 at that point or should the rawhide
package get named as a 032 prerelease version? I am not sure if people want the
release version changes to correspond more with Fedora releases or more to when
we do package updates. It looks like for 031, it was just tagged and a
separate branch wasn't created.
13 years, 10 months
Re: [Fedora-livecd-list] Bug in livecd-iso-to-disk for netinst images [SOLVED]
by Richard Shaw
On Tue, Jun 15, 2010 at 4:22 PM, Richard Shaw <hobbes1069(a)gmail.com> wrote:
> On Tue, Jun 15, 2010 at 3:19 PM, Jasper Hartline
> <jasper.hartline(a)gmail.com> wrote:
>> On Tue, Jun 15, 2010 at 10:35 AM, Richard Shaw <hobbes1069(a)gmail.com> wrote:
>>> I have the following bug[1] filed initially against anaconda but I
>>> think it's really a bug in the livecd-iso-to-disk utility.
>>>
>>> To summarize here:
>>> I used the livecd-iso-to-disk utility to setup a usb flash drive with
>>> the Fedora 13 netinstall iso. The problem is that the tool sets up the
>>> repo= parameter to anaconda which prevents anaconda from using an
>>> online source for packages. From what I understand now it should
>>> specify the stage2= parameter instead, which will allow anaconda to
>>> use the local install.img but still get installation packages from
>>> another source.
>>
>> I'm sure any patches are welcome if you believe this is a problem in
>> livecd-iso-to-disk
>> We have several people available who can commit.
>
> I'm not a bash programmer but I do know some python, but here's what I
> think is wrong, in theory...
>
> The detection portion of the code:
> ---
> detectisotype() {
> if [ -e $CDMNT/LiveOS/squashfs.img ]; then
> isotype=live
> return
> fi
> if [ -e $CDMNT/images/install.img ]; then
> isotype=installer
> return
> fi
> echo "ERROR: $ISO does not appear to be a Live image or DVD installer."
> exitclean
> }
> ---
> There needs to be a third option with the correct logic to figure out
> that install.img is available, but packages are not. Maybe it could be
> something like isotype=net_installer.
>
> Then this part:
> ---
> # DVD Installer
> if [ "$isotype" = "installer" ]; then
> sed -i -e "s;initrd=initrd.img;initrd=initrd.img
> repo=hd:$USBLABEL:/;g" $BOOTCONFIG $BOOTCONFIG_EFI
> sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI
> fi
> ---
> Might need to look like:
> ---
> # DVD Net Installer
> if [ "$isotype" = "net_installer" ]; then
> sed -i -e "s;initrd=initrd.img;initrd=initrd.img
> stage2=hd:$USBLABEL:/;g" $BOOTCONFIG $BOOTCONFIG_EFI
> sed -i -e "s;stage2=\S*;;g" $BOOTCONFIG $BOOTCONFIG_EFI
> fi
> ---
> Although I think the 2nd sed line would need to occur first or I think
> it will erase what the first sed line does.
I finally have F13 installing from the netinst image on my EEEPC!
I don't think anything I wrote previously is incorrect but I have some
things to add:
- There's no point in copying over the ISO of the netinst image to the
USB disk because it doesn't contain the installer packages.
- Updating the repo= to stage2= is correct but you also have to add
the full path to install.img, i.e:
stage2=hd:UUID=<UUID>:/images/install.img
Bug report[1] with patch has been submitted.
Richard
[1] http://bugzilla.redhat.com/show_bug.cgi?id=604942
13 years, 10 months
Bug in livecd-iso-to-disk for netinst images
by Richard Shaw
I have the following bug[1] filed initially against anaconda but I
think it's really a bug in the livecd-iso-to-disk utility.
To summarize here:
I used the livecd-iso-to-disk utility to setup a usb flash drive with
the Fedora 13 netinstall iso. The problem is that the tool sets up the
repo= parameter to anaconda which prevents anaconda from using an
online source for packages. From what I understand now it should
specify the stage2= parameter instead, which will allow anaconda to
use the local install.img but still get installation packages from
another source.
Is this practical to accomplish or is it expected that the user should
know to fix this before attempting an install?
Richard
[1] http://bugzilla.redhat.com/show_bug.cgi?id=599289
13 years, 10 months
Packages in F12 LiveCD desktop
by Taylor, Monroe E
I want to download the source RPMs for all of the packages included when the Fedora-livecd-desktop.ks file is used to created a liveCD.
Can anyone tell me if there is a group which contains these packages? Or do I have to download each of the packages listed in the Fedora-livecd-base.ks and Fedora-livecd-desktop.ks?
[cid:image001.gif@01CB0BB5.F0C8D1F0]
Monroe Taylor III
Test engineering
Intel Corporation
Americas Post Sales Support
(480) 552-3041 Fax (480) 552-7565
monroe.e.taylor(a)intel.com<mailto:monroe.e.taylor@intel.com>
13 years, 10 months
Patch to allow specifying a compressor when running livecd-creator
by Bruno Wolff III
I have attached a patch that allows specifying a compressor to use when
running livecd-creator.
I'd like some review to make sure it looks sane.
Assuming it looks good, I'd like to see it get into rawhide soon as either
an update to 031 or as 032.
I made the patch versus the head of the master branch, but it applied
cleanly to the 031 source from the F13 srpm.
I have done some testing and it seems to work reasonably and images using
zlib boot. (Images using lzma can be looked at for size, but won't boot.)
By getting it into rawhide now we can make sure the fallback after making
lzma the default is just making zlib the default again. (Just to be clear,
zlib is the default with this patch.)
13 years, 10 months
