febootstrap.git
13 years agoRemove obsolete ELF_DEFAULT_ARCH, DEFAULT_ARCH rules from Makefile.
Richard W.M. Jones [Fri, 26 Aug 2011 10:12:40 +0000 (11:12 +0100)]
Remove obsolete ELF_DEFAULT_ARCH, DEFAULT_ARCH rules from Makefile.

This updates commit df569d49aa10af5995f771362ddc1400f16486e8.

13 years agofebootstrap: Fix build on platforms where there is no native OCaml compiler.
Hilko Bengen [Thu, 25 Aug 2011 18:39:46 +0000 (19:39 +0100)]
febootstrap: Fix build on platforms where there is no native OCaml compiler.

13 years agofebootstrap-supermin-helper: Replace objcopy call for embedding init binary
Hilko Bengen [Wed, 24 Aug 2011 15:16:51 +0000 (17:16 +0200)]
febootstrap-supermin-helper: Replace objcopy call for embedding init binary

objcopy needs "output-target" and "binary-architecture" parameters
which makes it necessary to keep a list of known architectures.

The bin2s.pl script generates input for the GNU assembler which should
produce an object file that is equivalent to that produced by objcopy.

I have successfully tested the change on an amd64 Debian/unstable system.

RWMJ: Added bin2s.pl to EXTRA_DIST and updated .gitignore.

13 years agofebootstrap: Add --save-temps option to save temporary files on exit.
Richard W.M. Jones [Fri, 19 Aug 2011 09:06:00 +0000 (10:06 +0100)]
febootstrap: Add --save-temps option to save temporary files on exit.

13 years agoUpdate copyright notices in manual pages.
Richard W.M. Jones [Fri, 19 Aug 2011 09:06:26 +0000 (10:06 +0100)]
Update copyright notices in manual pages.

13 years agoInclude ext4 module in the initrd.
Richard W.M. Jones [Fri, 12 Aug 2011 22:25:17 +0000 (23:25 +0100)]
Include ext4 module in the initrd.

Modern kernels allow you to use the ext4.ko module to support ext2 and
ext3 access.

On Fedora, this is the default (albeit not as a module, so this code
path would not be tested yet).

13 years agoDownload archives with permissive umask (thanks David Konerding).
Richard W.M. Jones [Wed, 10 Aug 2011 19:26:51 +0000 (20:26 +0100)]
Download archives with permissive umask (thanks David Konerding).

https://www.redhat.com/archives/libguestfs/2011-August/msg00025.html

13 years agoVersion 3.8. 3.8
Richard W.M. Jones [Wed, 10 Aug 2011 19:28:08 +0000 (20:28 +0100)]
Version 3.8.

13 years agohelper: Allow kernel and modpath to be selected from envvars (RHBZ#671082).
Richard W.M. Jones [Fri, 22 Jul 2011 14:18:36 +0000 (15:18 +0100)]
helper: Allow kernel and modpath to be selected from envvars (RHBZ#671082).

13 years agohelper: create_kernel_archlinux should return const char *
Richard W.M. Jones [Fri, 22 Jul 2011 14:18:18 +0000 (15:18 +0100)]
helper: create_kernel_archlinux should return const char *

13 years agohelper: Move all_files down function.
Richard W.M. Jones [Fri, 22 Jul 2011 13:41:08 +0000 (14:41 +0100)]
helper: Move all_files down function.

This is just code tidy-up.

13 years agodebian: Check for gawk.
Richard W.M. Jones [Thu, 21 Jul 2011 07:32:54 +0000 (08:32 +0100)]
debian: Check for gawk.

13 years agoVersion 3.7. 3.7
Richard W.M. Jones [Fri, 15 Jul 2011 16:00:20 +0000 (17:00 +0100)]
Version 3.7.

13 years agoDe-duplicate directories with the same name, like "/etc" and "/etc/"
Richard W.M. Jones [Fri, 15 Jul 2011 15:57:55 +0000 (16:57 +0100)]
De-duplicate directories with the same name, like "/etc" and "/etc/"

In Rawhide there are two patches which create /etc/pam.d and /etc/pam.d/

febootstrap was trying to treat these as two separate directories.
Add a de-duplication step so that these names are considered the same.

We could go further than this patch (eg. removing multiple //
characters), but this patch is sufficient to fix Fedora builds.

13 years agodebian: Add missing build dependency on gawk.
Nikita A Menkovich [Fri, 15 Jul 2011 13:18:45 +0000 (14:18 +0100)]
debian: Add missing build dependency on gawk.

13 years agohelper: Fix error message when modules.dep is not found.
Richard W.M. Jones [Mon, 6 Jun 2011 16:07:23 +0000 (17:07 +0100)]
helper: Fix error message when modules.dep is not found.

13 years agoRemove trailing whitespace from one line.
Richard W.M. Jones [Mon, 6 Jun 2011 13:18:55 +0000 (14:18 +0100)]
Remove trailing whitespace from one line.

13 years agofebootstrap/helper: Major change to kernel module handling code
Hilko Bengen [Sat, 4 Jun 2011 23:02:50 +0000 (01:02 +0200)]
febootstrap/helper: Major change to kernel module handling code

The previous implementation had two problems: (I) Not all needed
kernel modules were copied to the initrd. (II) If a kernel module
depended on more than one other module, only the first dependency was
considered for the load order. Using 2.6.39-1-amd64 (Debian/unstable)
ext2.ko was not loaded and therefore the root FS could not be mounted.

The use of tsort(1) has been replaced with a set of functions that
build a DAG in memory and use that to calculate the list of modules to
be copied into the initrd and the order in which to load them.

13 years agofebootstrap/helper/init: Add translations for errno
Hilko Bengen [Sat, 4 Jun 2011 23:02:49 +0000 (01:02 +0200)]
febootstrap/helper/init: Add translations for errno

13 years agoVersion 3.6. 3.6
Richard W.M. Jones [Wed, 1 Jun 2011 10:07:45 +0000 (11:07 +0100)]
Version 3.6.

13 years agoFix some printf format warnings when -Wall is enabled.
Richard W.M. Jones [Wed, 1 Jun 2011 09:36:42 +0000 (10:36 +0100)]
Fix some printf format warnings when -Wall is enabled.

13 years agofebootstrap/helper/init: Mount /proc if not already present.
Hilko Bengen [Tue, 31 May 2011 22:43:12 +0000 (00:43 +0200)]
febootstrap/helper/init: Mount /proc if not already present.

13 years agoDon't require external insmod.static.
Hilko Bengen [Tue, 31 May 2011 22:43:10 +0000 (00:43 +0200)]
Don't require external insmod.static.

Add module loading functionality into init.c, thus making
insmod.static unnecessary.

13 years agofebootstrap: Look for insmod.static, mke2fs in /sbin
Hilko Bengen [Tue, 31 May 2011 22:43:09 +0000 (00:43 +0200)]
febootstrap: Look for insmod.static, mke2fs in /sbin

13 years agoForce creation of /lib/modules directory.
Hilko Bengen [Mon, 30 May 2011 22:14:11 +0000 (00:14 +0200)]
Force creation of /lib/modules directory.

After adding a line containing "/lib/modules" to hostfiles solved the
immediate problem for me -- febootstrap-supermin-helper finished its
run.

The attached patch makes sure that febootstrap-supermin-helper always
creates this directory.

13 years agoVersion 3.5. 3.5
Richard W.M. Jones [Fri, 27 May 2011 11:09:35 +0000 (12:09 +0100)]
Version 3.5.

13 years agoCheck lseek return type against (off_t) -1.
Daniel Berrange [Fri, 27 May 2011 10:58:50 +0000 (11:58 +0100)]
Check lseek return type against (off_t) -1.

13 years agoIncrease appliance container to 4 GB.
Richard W.M. Jones [Fri, 27 May 2011 10:56:21 +0000 (11:56 +0100)]
Increase appliance container to 4 GB.

The overhead is now 66 MB which is unfortunate.  However 4 GB should
be enough for people who accidentally add kernel modules that are
hand-compiled with all the debuginfo information in them.

13 years agohelper: Add better error messages if files too big for appliance root.
Richard W.M. Jones [Fri, 27 May 2011 10:54:54 +0000 (11:54 +0100)]
helper: Add better error messages if files too big for appliance root.

The appliance root was 1GB.  However the error message you got
if you overran this space was very obscure:

  febootstrap-supermin-helper: ext2fs_file_write:
  Could not allocate block in ext2 filesystem

This adds the name of the file that is failing, and replaces the error
message with something more meaningful.

13 years agohelper: When /init fails, print some debugging information.
Richard W.M. Jones [Thu, 12 May 2011 13:56:11 +0000 (14:56 +0100)]
helper: When /init fails, print some debugging information.

13 years agoForce mode +x on insmod.static binary (RHBZ#666880).
Richard W.M. Jones [Thu, 12 May 2011 13:51:28 +0000 (14:51 +0100)]
Force mode +x on insmod.static binary (RHBZ#666880).

13 years agohelper: Change to root directory before running find command.
Richard W.M. Jones [Wed, 27 Apr 2011 09:39:24 +0000 (10:39 +0100)]
helper: Change to root directory before running find command.

13 years agohelper: Don't fail if objects are created in a symlinked dir (RHBZ#698089).
Richard W.M. Jones [Wed, 20 Apr 2011 10:35:19 +0000 (11:35 +0100)]
helper: Don't fail if objects are created in a symlinked dir (RHBZ#698089).

13 years agoVersion 3.4. 3.4
Richard W.M. Jones [Fri, 18 Mar 2011 22:10:13 +0000 (22:10 +0000)]
Version 3.4.

13 years agoAllow config files from different packages if both files have zero size.
Richard Jones [Fri, 18 Mar 2011 14:54:23 +0000 (14:54 +0000)]
Allow config files from different packages if both files have zero size.

Fairly recurrent bug in Fedora.  It need not cause us to fail,
provided that both config files are empty.

13 years agoCollect the size (ft_size) of files from package handlers.
Richard Jones [Fri, 18 Mar 2011 14:53:04 +0000 (14:53 +0000)]
Collect the size (ft_size) of files from package handlers.

13 years agoLink init with '-static' instead of '-all-static'.
Richard W.M. Jones [Mon, 14 Mar 2011 10:45:41 +0000 (10:45 +0000)]
Link init with '-static' instead of '-all-static'.

Latest gcc (4.6.0) does not recognize the -all-static
option; see http://gcc.gnu.org/bugzilla/show_bug.cgi?id=46410

Using -static still results in a static init binary:
$ file helper/init
helper/init: ELF 64-bit LSB executable, x86-64, version 1 (GNU/Linux), statically linked, for GNU/Linux 2.6.32, stripped
$ ldd helper/init
           not a dynamic executable
(cherry picked from commit 42a6e60307b8116dd888e9dae4960f12d895f73f)

13 years agohelper: Add support for ArchLinux kernels.
Richard W.M. Jones [Sun, 12 Dec 2010 10:40:57 +0000 (10:40 +0000)]
helper: Add support for ArchLinux kernels.

ArchLinux doesn't use the ordinary Linux kernel naming scheme.
(Thanks Thomas S Hatch for helping to diagnose the issue)

13 years agopacman: Update ArchLinux module.
Thomas S Hatch [Sun, 12 Dec 2010 10:23:58 +0000 (10:23 +0000)]
pacman: Update ArchLinux module.

If package is not in the main repos, check AUR.

Download and unpack the package.

13 years agoVersion 3.3. 3.3
Richard W.M. Jones [Sat, 11 Dec 2010 17:17:57 +0000 (17:17 +0000)]
Version 3.3.

13 years agohelper: Ignore times of special files when calculating checksum.
Richard W.M. Jones [Sat, 11 Dec 2010 17:12:30 +0000 (17:12 +0000)]
helper: Ignore times of special files when calculating checksum.

Variation in the times of /dev/ptmx was causing the
appliance to be rebuilt too frequently.

13 years agoAdd debian/ subdirectory (temporary).
Richard W.M. Jones [Thu, 9 Dec 2010 15:23:33 +0000 (15:23 +0000)]
Add debian/ subdirectory (temporary).

This adds the debian/ subdirectory to make it easier for us
to build Debian packages.

When we get this into Debian, this directory can be removed.

13 years agodebian, pacman: incorrect detection of config files.
Richard W.M. Jones [Thu, 9 Dec 2010 16:12:20 +0000 (16:12 +0000)]
debian, pacman: incorrect detection of config files.

Config files were being incorrectly detected, with the
effect that all /etc/ files were being added to hostfiles.

13 years agodocs: Missing backslash.
Richard W.M. Jones [Tue, 7 Dec 2010 22:10:03 +0000 (22:10 +0000)]
docs: Missing backslash.

13 years agoAdd pod.css to EXTRA_DIST. 3.2
Richard W.M. Jones [Tue, 7 Dec 2010 19:58:29 +0000 (19:58 +0000)]
Add pod.css to EXTRA_DIST.

13 years agoVersion 3.2
Richard W.M. Jones [Tue, 7 Dec 2010 19:57:10 +0000 (19:57 +0000)]
Version 3.2

13 years agodocs: Refresh documentation with explanation of supermin appliances.
Richard W.M. Jones [Tue, 7 Dec 2010 19:49:08 +0000 (19:49 +0000)]
docs: Refresh documentation with explanation of supermin appliances.

13 years agohelper: Remove refs in docs to old manual pages.
Richard W.M. Jones [Tue, 7 Dec 2010 18:59:29 +0000 (18:59 +0000)]
helper: Remove refs in docs to old manual pages.

13 years agoAdd HTML documentation to the public website.
Richard W.M. Jones [Tue, 7 Dec 2010 18:56:45 +0000 (18:56 +0000)]
Add HTML documentation to the public website.

13 years agoautobuild: Factor out HOSTNAME variable.
Richard W.M. Jones [Tue, 7 Dec 2010 16:26:55 +0000 (16:26 +0000)]
autobuild: Factor out HOSTNAME variable.

13 years agoAdd autobuild script.
Richard W.M. Jones [Tue, 7 Dec 2010 10:17:47 +0000 (10:17 +0000)]
Add autobuild script.

This script is run on the builder(s) regularly.

13 years agoReal fix for .*.hmac files (accidental reopening of RHBZ#654638).
Richard W.M. Jones [Tue, 7 Dec 2010 08:33:40 +0000 (08:33 +0000)]
Real fix for .*.hmac files (accidental reopening of RHBZ#654638).

Previous commit was broken.

13 years agoProperly ignore .*.hmac files (accidental reopening of RHBZ#654638).
Richard W.M. Jones [Mon, 6 Dec 2010 23:00:39 +0000 (23:00 +0000)]
Properly ignore .*.hmac files (accidental reopening of RHBZ#654638).

13 years agoVersion 3.1. 3.1
Richard W.M. Jones [Mon, 6 Dec 2010 17:20:07 +0000 (17:20 +0000)]
Version 3.1.

13 years agoAdd --yum-config option to set a yum configuration file.
Richard W.M. Jones [Mon, 6 Dec 2010 17:14:03 +0000 (17:14 +0000)]
Add --yum-config option to set a yum configuration file.

13 years agoClean up some warnings and debug messages.
Richard W.M. Jones [Mon, 6 Dec 2010 17:13:32 +0000 (17:13 +0000)]
Clean up some warnings and debug messages.

13 years agoyum: Don't pass tmpdir as an explicit parameter.
Richard W.M. Jones [Mon, 6 Dec 2010 16:46:52 +0000 (16:46 +0000)]
yum: Don't pass tmpdir as an explicit parameter.

Encode it directly in the script instead.

13 years agoyum: Call setCacheDir so this works for non-root users.
Richard W.M. Jones [Mon, 6 Dec 2010 16:45:57 +0000 (16:45 +0000)]
yum: Call setCacheDir so this works for non-root users.

13 years agoAllow --verbose to control whether yum messages are verbose.
Richard W.M. Jones [Mon, 6 Dec 2010 16:44:46 +0000 (16:44 +0000)]
Allow --verbose to control whether yum messages are verbose.

Without --verbose, yum will be quiet for once.

13 years agoAdd support for Arch Linux (pacman package manager).
Thomas S Hatch [Mon, 6 Dec 2010 15:26:43 +0000 (15:26 +0000)]
Add support for Arch Linux (pacman package manager).

13 years agodocs: Arrange required/optional packages more logically.
Richard W.M. Jones [Mon, 6 Dec 2010 12:31:19 +0000 (12:31 +0000)]
docs: Arrange required/optional packages more logically.

13 years agodocs: Note that gawk (GNU awk) is required.
Richard W.M. Jones [Mon, 6 Dec 2010 12:31:06 +0000 (12:31 +0000)]
docs: Note that gawk (GNU awk) is required.

13 years agoconfigure: Check for insmod.static and fail if not present.
Richard W.M. Jones [Mon, 6 Dec 2010 12:22:58 +0000 (12:22 +0000)]
configure: Check for insmod.static and fail if not present.

This is not packaged on Debian/Ubuntu, but we require it.  Fail
with a useful error message if it is not available.

13 years agodocs: Note that libcom_err is required.
Richard W.M. Jones [Mon, 6 Dec 2010 12:22:28 +0000 (12:22 +0000)]
docs: Note that libcom_err is required.

13 years agoRewrite febootstrap as a general supermin appliance building tool. 3.0
Richard W.M. Jones [Fri, 3 Dec 2010 13:17:00 +0000 (13:17 +0000)]
Rewrite febootstrap as a general supermin appliance building tool.

This complete rewrite of the building tools turns febootstrap
into a general purpose, cross-distro, supermin appliance only
build tool.

There is now only one program 'febootstrap' which is used to
build a supermin appliance from a list of packages.

Normal appliances are not supported.

The tools are incompatible with febootstrap 2.x (use the
febootstrap-2.x branch from git to get the old package).

14 years agoVersion 2.11. 2.11
Richard W.M. Jones [Thu, 25 Nov 2010 18:17:52 +0000 (18:17 +0000)]
Version 2.11.

14 years agoext2: Fix "ext2fs_mkdir .. No free space in directory".
Richard W.M. Jones [Thu, 25 Nov 2010 17:37:35 +0000 (17:37 +0000)]
ext2: Fix "ext2fs_mkdir .. No free space in directory".

We weren't expanding ext2 directories and as a result we could
hit a limit when the directory grows larger than one block.

Note that this fix only applies for creating subdirectories.
For creating files (ie. ext2fs_link) we were already doing the
right thing.

14 years agoelf-default-arch should exit with an error if it fails.
Richard W.M. Jones [Sat, 6 Nov 2010 10:46:17 +0000 (10:46 +0000)]
elf-default-arch should exit with an error if it fails.

14 years agoFix elf-default-arch for ppc and ppc64.
Richard W.M. Jones [Sat, 6 Nov 2010 10:45:53 +0000 (10:45 +0000)]
Fix elf-default-arch for ppc and ppc64.

14 years agognulib: Ignore another gnulib generated file.
Richard W.M. Jones [Sat, 6 Nov 2010 10:23:24 +0000 (10:23 +0000)]
gnulib: Ignore another gnulib generated file.

14 years agomain should return int
Richard W.M. Jones [Sat, 6 Nov 2010 10:23:08 +0000 (10:23 +0000)]
main should return int

14 years agoRHEL 5: Don't pass BLOCK_FLAG_READ_ONLY to ext2_block_iterate if not defined.
Richard W.M. Jones [Sat, 6 Nov 2010 10:22:41 +0000 (10:22 +0000)]
RHEL 5: Don't pass BLOCK_FLAG_READ_ONLY to ext2_block_iterate if not defined.

14 years agoVersion 2.10. 2.10
Richard W.M. Jones [Thu, 28 Oct 2010 15:54:43 +0000 (16:54 +0100)]
Version 2.10.

14 years agoIgnore cscope.out
Matthew Booth [Thu, 28 Oct 2010 14:17:22 +0000 (15:17 +0100)]
Ignore cscope.out

14 years agoAdd -u and -g options to febootstrap-supermin-helper
Matthew Booth [Thu, 28 Oct 2010 14:17:21 +0000 (15:17 +0100)]
Add -u and -g options to febootstrap-supermin-helper

Bash automatically resets euid to uid when it executes. This means that the
effective user id of a program at the point it calls febootstrap-supermin-helper
will be lost if any part of execution chain involved bash. This in turn can
result in:

* the generation of an incorrect checksum, which contains the uid.
* the generation of supermin files with a mixture of owners

The -u and -g options allow the caller to pass in an explicit user and group to
run as. febootstrap-supermin-helper will set(u|g)id as appropriate.

14 years agoSend usage output to stdout or stderr depending on context.
Matthew Booth [Fri, 1 Oct 2010 16:23:11 +0000 (17:23 +0100)]
Send usage output to stdout or stderr depending on context.

If usage information is displayed because of an error, it should go to stderr.
If it is displayed because the -h option was given it should go to stdout.

14 years agoAdd gnulib as a submodule.
Matthew Booth [Fri, 1 Oct 2010 16:00:11 +0000 (18:00 +0200)]
Add gnulib as a submodule.

(Thanks also to Jim Meyering for resolving the git submodule problems).

14 years agoUpdate gnulib.
Richard W.M. Jones [Fri, 17 Sep 2010 13:17:57 +0000 (14:17 +0100)]
Update gnulib.

14 years agoFix elf-default-arch detection to work on secondary archs (RHBZ#634951)
Dan Horák [Fri, 17 Sep 2010 13:13:27 +0000 (14:13 +0100)]
Fix elf-default-arch detection to work on secondary archs (RHBZ#634951)

Recent state of the elf-default-arch script and the hardcoded i386 arch doesn't
allow building on other arches than ix86 or x86_64. See attachment for a fix.
Can be easily extended to support additional secondary arches by adding new
patterns to the elf-default-arch script

14 years agoVersion 2.9 2.9
Richard Jones [Fri, 27 Aug 2010 16:38:53 +0000 (17:38 +0100)]
Version 2.9

14 years agohelper: Ignore editor backup (*~) files.
Richard Jones [Fri, 27 Aug 2010 16:04:53 +0000 (17:04 +0100)]
helper: Ignore editor backup (*~) files.

14 years agohelper: Visit directory entries in order.
Richard Jones [Fri, 27 Aug 2010 16:03:57 +0000 (17:03 +0100)]
helper: Visit directory entries in order.

Previously in febootstrap-supermin-helper we would visit the
files in supermin.d in arbitrary (ie. readdir) order.  This has
caused a series of heisenbugs where some implicit dependency
between these files has not been honoured.  The latest one is
that '/etc/localtime' can be added to the appliance before '/etc'
has been created (and this operation fails).

Instead of continuing to chase these, this commit forces us to
visit the files in filename order by sorting them before visiting
them.

Note that in libguestfs, the current order is sufficient, because
the files are called:

base.img
daemon.img
hostfiles

14 years agoVersion 2.8. 2.8
Richard Jones [Sat, 21 Aug 2010 08:39:14 +0000 (09:39 +0100)]
Version 2.8.

Update gnulib.

14 years agoAdd -f checksum mode to allow caching of appliances.
Richard Jones [Fri, 20 Aug 2010 20:31:49 +0000 (21:31 +0100)]
Add -f checksum mode to allow caching of appliances.

14 years agoImplement ext2 output module.
Richard Jones [Fri, 20 Aug 2010 18:23:03 +0000 (19:23 +0100)]
Implement ext2 output module.

14 years agoRemove bogus 'whitelist' parameter from usage.
Richard Jones [Thu, 19 Aug 2010 15:11:44 +0000 (16:11 +0100)]
Remove bogus 'whitelist' parameter from usage.

Use the -k whitelist option to get a kernel whitelist.

This is a bug in current febootstrap-supermin-helper.

14 years agoAdd -f ext2 option.
Richard Jones [Thu, 19 Aug 2010 14:21:17 +0000 (15:21 +0100)]
Add -f ext2 option.

This option doesn't work yet.  The commit is just for adding the
capability to pass the extra kernel/initrd/appliance parameters
through 'main.c' and 'appliance.c'.

14 years agoAdd -f option for selecting the output format.
Richard Jones [Thu, 19 Aug 2010 13:58:03 +0000 (14:58 +0100)]
Add -f option for selecting the output format.

Only -f cpio is permitted by this commit.

14 years agoRefactor cpio code into separate file.
Richard Jones [Thu, 19 Aug 2010 13:23:11 +0000 (14:23 +0100)]
Refactor cpio code into separate file.

We create a 'writer' abstraction and (currently) a single implementation
of this which can write cpio files.  All cpio-related code is moved
out of 'appliance.c' into 'cpio.c'.  'appliance.c' becomes a generic
appliance builder.

This commit should not change the semantics of the program.

14 years agoChange initrd -> appliance.
Richard Jones [Thu, 19 Aug 2010 12:55:36 +0000 (13:55 +0100)]
Change initrd -> appliance.

We are going to be writing a general appliance, not necessarily
an initrd.  In the ext2 appliance case we will _also_ write an
initrd, so we shouldn't confuse the two things.

14 years agoRefactor febootstrap-supermin-helper code into separate files.
Richard Jones [Thu, 19 Aug 2010 12:41:12 +0000 (13:41 +0100)]
Refactor febootstrap-supermin-helper code into separate files.

This is just code movement.  There is no change to the code.

14 years agoMove febootstrap-supermin-helper into helper/ subdirectory.
Richard Jones [Thu, 19 Aug 2010 12:21:37 +0000 (13:21 +0100)]
Move febootstrap-supermin-helper into helper/ subdirectory.

This will allow us to split up the monolithic C program into
separate files for ease of modification.

This patch is just file rearrangement.

14 years agoFix febootstrap-supermin-helper for dual boot case (RHBZ#594021).
Richard Jones [Fri, 21 May 2010 08:35:05 +0000 (09:35 +0100)]
Fix febootstrap-supermin-helper for dual boot case (RHBZ#594021).

Jinxin Zheng found a case where libguestfs-supermin-helper
(now febootstrap-supermin-helper) would fail to locate a
suitable kernel on a dual boot RHEL 5 + 6 system.

The issue was that febootstrap-supermin-helper will first look
for kernels with an <arch> field in the name (as is the case
for RHEL 6 kernels).  If none of these are found, it would look
for kernels without an <arch> field (RHEL 5 kernels).  Then it
would look for corresponding module directories.

This fails if the dual boot system is booted into RHEL 5 because
the first step will find only RHEL 6 kernels, and then the third
step will fail to find any module directories (step two having
been skipped in this case).

This changes the code to look for module directories when
searching for kernels, and discard any kernels which don't
have module directories first.  Thus all RHEL 6 kernels will
be discarded, and we will proceed to step two and find some
RHEL 5 kernels.

14 years agoPull in febootstrap-supermin-helper (C version) from libguestfs. 2.7
Richard Jones [Thu, 13 May 2010 12:29:20 +0000 (13:29 +0100)]
Pull in febootstrap-supermin-helper (C version) from libguestfs.

This commit also pulls in the automake C dependencies and gnulib.

febootstrap-supermin-helper is modified so that it has the
--kmods option (to read the whitelist, from the old shell script),
and so that it can read supermin appliances composed of multiple
parts from out of a directory.

Also: Updates to documentation.

14 years agoInclude /etc/localtime from local machine in the supermin appliance.
Richard Jones [Mon, 12 Apr 2010 17:56:32 +0000 (18:56 +0100)]
Include /etc/localtime from local machine in the supermin appliance.

This is a backport of libguestfs commit
508f1ee87e816bf6b6fc8e629ccbb2d61a971169.

14 years agoBackport libguestfs exception for libntfs-3g.so.N to febootstrap.
Richard Jones [Fri, 12 Mar 2010 15:30:29 +0000 (15:30 +0000)]
Backport libguestfs exception for libntfs-3g.so.N to febootstrap.

This is a port of:
http://git.annexia.org/?p=libguestfs.git;a=commitdiff_plain;h=599f94c9c14c970dcfd7cec8d6898cd3b46af8ca

14 years agoBackport more complete fix for bash regexp quoting bug from libguestfs.
Richard Jones [Wed, 3 Mar 2010 15:54:57 +0000 (15:54 +0000)]
Backport more complete fix for bash regexp quoting bug from libguestfs.

14 years agoBackport supermin hostfiles / bash quoting fix from libguestfs.
Richard Jones [Mon, 1 Mar 2010 13:46:46 +0000 (13:46 +0000)]
Backport supermin hostfiles / bash quoting fix from libguestfs.

This also makes small rearrangements to the code to bring
it closer to what is in libguestfs's supermin-split.sh.in script.

14 years agosupermin: Backport special case handling of libgcc_s.
Richard Jones [Thu, 28 Jan 2010 10:01:09 +0000 (10:01 +0000)]
supermin: Backport special case handling of libgcc_s.

This is a port of
http://git.annexia.org/?p=libguestfs.git;a=commit;h=dab98a0e52b9bb9930048b94d637a2fdb218fc45

14 years agoBackport "supermin: Prevent multilib corruption (RHBZ#558593)" from libguestfs
Richard Jones [Tue, 26 Jan 2010 10:52:56 +0000 (10:52 +0000)]
Backport "supermin: Prevent multilib corruption (RHBZ#558593)" from libguestfs

Make sure the febootstrap-supermin-helper script does not contain
any hard-wired references to the current architecture.