[Patch] specify custom directories

[Jeroen van Meeuwen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Attached is a patch to customize the build_dir, yum cachedir and yum
installroot.

Hope you find it usefull.

Kind regards,

Jeroen van Meeuwen
- -kanarip
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.7 (MingW32)
> Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org
>
> iD8DBQFGI5biKN6f2pNCvwgRAs0fAJ9yOMmYVobrSejxMG+KbwVDKzC6OgCgkqTw
> HpfvOja4CKtUfA1psUWfM+s=
> =ibd4
> -----END PGP SIGNATURE----- 
--- livecd/creator/livecd-creator.orig	2007-04-16 17:27:53.000000000 +0200
+++ livecd/creator/livecd-creator	2007-04-16 17:21:53.000000000 +0200
@@ -361,20 +361,33 @@
         fstab.write("sysfs                   /sys                    sysfs  
defaults        0 0\n")
         fstab.close()
 
-    def setup(self, image_size, base_on = None):
+    def setup(self, image_size, base_on = None, build_dir = None, yum_installroot = None,
yum_cachedir = None):
         """setup target ext3 file system in preparation for an
install"""
 
         # setup temporary build dirs
-        try:
-            self.build_dir = tempfile.mkdtemp(dir="/var/tmp",
prefix="livecd-creator-")
-        except OSError, (err, msg):
-            raise InstallationError("Failed create build directory in /var/tmp:
%s" % msg)
+        if not build_dir:
+            try:
+                self.build_dir = tempfile.mkdtemp(dir="/var/tmp",
prefix="livecd-creator-")
+            except OSError, (err, msg):
+                raise InstallationError("Failed create build directory in /var/tmp:
%s" % msg)
+        else:
+            self.build_dir = build_dir
+            os.makedirs(self.build_dir)
 
         os.makedirs(self.build_dir + "/out/isolinux")
         os.makedirs(self.build_dir + "/out/sysroot")
         os.makedirs(self.build_dir + "/data/sysroot")
-        os.makedirs(self.build_dir + "/install_root")
-        os.makedirs(self.build_dir + "/yum-cache")
+
+        if not yum_installroot:
+            os.makedirs(self.build_dir + "/install_root")
+        else:
+            os.symlink(yum_installroot,self.build_dir + "/install_root")
+
+        if not yum_cachedir:
+            os.makedirs(self.build_dir + "/yum-cache")
+# Don't know if this is usefull for others, revisor doesn't need it
+#        else:
+#            os.symlink(yum_cachedir, self.build_dir + "/yum-cache")
 
         if base_on:
             # get backing ext3 image if we're based this build on an existing live CD
ISO
@@ -405,10 +418,12 @@
 
         # bind mount system directories into install_root/
         for (f, dest) in [("/sys", None), ("/proc", None),
("/dev", None),
-                          ("/dev/pts", None), ("/selinux", None),
-                          (self.build_dir + "/yum-cache",
"/var/cache/yum")]:
+                          ("/dev/pts", None), ("/selinux", None)]:
             self.bindmounts.append(BindChrootMount(f, self.build_dir +
"/install_root", dest))
 
+        if not yum_cachedir:
+            self.bindmounts.append(BindChrootMount(self.build_dir +
"/yum-cache", self.build_dir + "/install_root",
"/var/cache/yum"))
+
         for b in self.bindmounts:
             b.mount()
 
@@ -745,6 +760,9 @@
                       [--skip-compression]
                       [--uncompressed-size=<size-in-MB>]
                       [--shell]
+                      [--builddir]
+                      [--yumcache]
+                      [--installroot]
 
  --help              : Print usage and exit
  --config            : Path to kickstart config file
@@ -756,6 +774,9 @@
  --skip-compression  : Don't compress the image
  --uncompressed-size : Size of uncompressed fs in MB (default: 3072)
  --shell             : Start a shell in the chroot for post-configuration
+ --builddir          : Use this build directory
+ --yumcache          : Use this yum cache directory
+ --installroot       : Use this directory as installroot
 
  Examples:
 
@@ -785,14 +806,17 @@
         self.skip_prelink = False
         self.uncompressed_size = 3072
         self.give_shell = False
+        self.build_dir = None
+        self.yum_cache = None
+        self.install_root = None
 
 def parse_options(args):
     try:
-        opts, args = getopt.getopt(args, "hr:b:p:e:f:c:su:l",
+        opts, args = getopt.getopt(args, "hr:b:p:e:f:c:su:l:bd:y:i",
                                    ["help", "repo=",
"base-on=", "package=",
                                     "exclude-package=", "fslabel=",
"config=",
                                     "skip-compression",
"uncompressed-size=",
-                                    "shell", "no-prelink"])
+                                    "shell", "no-prelink",
"build_dir","yum_cache","install_root"])
     except getopt.GetoptError, msg:
         raise Usage(msg)
 
@@ -844,6 +868,15 @@
             if not os.path.isfile(options.base_on):
                 raise Usage("Live CD ISO '%s' does not exist" %
options.base_on)
             continue
+        if o in ("-bd", "--builddir"):
+            options.build_dir = a
+            continue
+        if o in ("-y", "--yumcache"):
+            options.yum_cache = a
+            continue
+        if o in ("-i", "--installroot"):
+            options.install_root = a
+            continue
         raise Usage("Unknown option %s" % o)
 
     if not options.kscfg and not (options.packages or options.groups):
@@ -884,7 +917,7 @@
     try:
         target.parse(options.kscfg)
 
-        target.setup(options.uncompressed_size, options.base_on)
+        target.setup(options.uncompressed_size, options.base_on,
build_dir=options.build_dir, yum_cachedir=options.yum_cache,
yum_installroot=options.install_root)
 
         target.install()

[Jeremy Katz]

On Mon, 2007-04-16 at 17:31 +0200, Jeroen van Meeuwen wrote:
>  Attached is a patch to customize the build_dir, yum cachedir and yum
>  installroot. 
build dir and cachedir make sense to me[1], but what's the value in
setting install_root explicitly?  And as it stands, you're not even
using the value since there are lots of other places where we expect
that the install root is builddir/install_root.

Jeremy

[1] builddir to point to some form of shared storage or just somewhere
with more space than /var/tmp.  And the yum cache so that if you have
things previously downloaded and cached, you can then take advantage of
them

[Jeroen van Meeuwen]

Jeremy Katz wrote:
>  On Mon, 2007-04-16 at 17:31 +0200, Jeroen van Meeuwen wrote:
> > Attached is a patch to customize the build_dir, yum cachedir and yum
> > installroot.
>  
>  build dir and cachedir make sense to me[1], but what's the value in
>  setting install_root explicitly?  And as it stands, you're not even
>  using the value since there are lots of other places where we expect
>  that the install root is builddir/install_root.
>   
That is why the yum_installroot passed is actually being symlinked from 
builddir/install_root. line ~34 in the patch. This allows a yum object 
already initialized to keep the installroot yet "install into 
builddir/install_root".

Kind regards,

Jeroen van Meeuwen
-kanarip

[Jeremy Katz]

On Wed, 2007-04-18 at 14:48 +0200, Jeroen van Meeuwen wrote:
>  Jeremy Katz wrote:
>  > On Mon, 2007-04-16 at 17:31 +0200, Jeroen van Meeuwen wrote:
>  >> Attached is a patch to customize the build_dir, yum cachedir and yum
>  >> installroot.
>  > 
>  > build dir and cachedir make sense to me[1], but what's the value in
>  > setting install_root explicitly?  And as it stands, you're not even
>  > using the value since there are lots of other places where we expect
>  > that the install root is builddir/install_root.
>
>  That is why the yum_installroot passed is actually being symlinked from 
>  builddir/install_root. line ~34 in the patch. This allows a yum object 
>  already initialized to keep the installroot yet "install into 
>  builddir/install_root". 
But why do you actually need that?  The install_root is where the file
system image gets mounted and so if you already have things in a
directory, that's not going to help.  

Jeremy

[Jeroen van Meeuwen]

Jeremy Katz wrote:
>  On Wed, 2007-04-18 at 14:48 +0200, Jeroen van Meeuwen wrote:
> > Jeremy Katz wrote:
> >> On Mon, 2007-04-16 at 17:31 +0200, Jeroen van Meeuwen wrote:
> >>> Attached is a patch to customize the build_dir, yum cachedir and yum
> >>> installroot.
> >> build dir and cachedir make sense to me[1], but what's the value in
> >> setting install_root explicitly?  And as it stands, you're not even
> >> using the value since there are lots of other places where we expect
> >> that the install root is builddir/install_root.
> > That is why the yum_installroot passed is actually being symlinked from 
> > builddir/install_root. line ~34 in the patch. This allows a yum object 
> > already initialized to keep the installroot yet "install into 
> > builddir/install_root".
>  
>  But why do you actually need that?  The install_root is where the file
>  system image gets mounted and so if you already have things in a
>  directory, that's not going to help.  
>   
I do not already have things in a directory (well actually, I do, but I 
don't care about them being trashed), I have an object pointing to a 
directory and I cannot change that without destroying and recreating the 
object.

The patch is doing what I need, and afaics is not disruptive to 
livecd-creator's way of doing things, right?

Kind regards,

Jeroen van Meeuwen
-kanarip

[Jeremy Katz]

On Wed, 2007-04-18 at 15:50 +0200, Jeroen van Meeuwen wrote:
>  Jeremy Katz wrote:
>  > On Wed, 2007-04-18 at 14:48 +0200, Jeroen van Meeuwen wrote:
>  >> Jeremy Katz wrote:
>  >>> On Mon, 2007-04-16 at 17:31 +0200, Jeroen van Meeuwen wrote:
>  >>>> Attached is a patch to customize the build_dir, yum cachedir and yum
>  >>>> installroot.
>  >>> build dir and cachedir make sense to me[1], but what's the value in
>  >>> setting install_root explicitly?  And as it stands, you're not even
>  >>> using the value since there are lots of other places where we expect
>  >>> that the install root is builddir/install_root.
>  >> That is why the yum_installroot passed is actually being symlinked from 
>  >> builddir/install_root. line ~34 in the patch. This allows a yum object 
>  >> already initialized to keep the installroot yet "install into 
>  >> builddir/install_root".
>  > 
>  > But why do you actually need that?  The install_root is where the file
>  > system image gets mounted and so if you already have things in a
>  > directory, that's not going to help.  
>  > 
>  
>  I do not already have things in a directory (well actually, I do, but I 
>  don't care about them being trashed), I have an object pointing to a 
>  directory and I cannot change that without destroying and recreating the 
>  object. 
But what are you trying to do?  You just keep talking about objects and
implementation details, not about the actual task you're trying to do.
What magic is going on that it's so important that this be kept in sync?

>  The patch is doing what I need, and afaics is not disruptive to 
>  livecd-creator's way of doing things, right? 
It could have some ... interesting effects across error handling and
adds an entirely new class of things there to check for and ensure keep
working. 

Jeremy

[Jeroen van Meeuwen]

Jeremy Katz wrote:
>  On Wed, 2007-04-18 at 15:50 +0200, Jeroen van Meeuwen wrote:
> > Jeremy Katz wrote:
> >> On Wed, 2007-04-18 at 14:48 +0200, Jeroen van Meeuwen wrote:
> >>> Jeremy Katz wrote:
> >>>> On Mon, 2007-04-16 at 17:31 +0200, Jeroen van Meeuwen wrote:
> >>>>> Attached is a patch to customize the build_dir, yum cachedir and yum
> >>>>> installroot.
> >>>> build dir and cachedir make sense to me[1], but what's the value in
> >>>> setting install_root explicitly?  And as it stands, you're not even
> >>>> using the value since there are lots of other places where we expect
> >>>> that the install root is builddir/install_root.
> >>> That is why the yum_installroot passed is actually being symlinked from 
> >>> builddir/install_root. line ~34 in the patch. This allows a yum object 
> >>> already initialized to keep the installroot yet "install into 
> >>> builddir/install_root".
> >> But why do you actually need that?  The install_root is where the file
> >> system image gets mounted and so if you already have things in a
> >> directory, that's not going to help.  
> >>
> > I do not already have things in a directory (well actually, I do, but I 
> > don't care about them being trashed), I have an object pointing to a 
> > directory and I cannot change that without destroying and recreating the 
> > object.
>  
>  But what are you trying to do?  You just keep talking about objects and
>  implementation details, not about the actual task you're trying to do.
>  What magic is going on that it's so important that this be kept in sync?
>   
As said before, the already existent yum object points at another 
directory then builddir/install_root and the goal of specifying another 
install root then builddir/install_root is to be able to preserve the 
yum object as-is.

Bigger picture however is, I'm really trying to allow us to get into 
livecd-creator what we need for Revisor to be able to exec().

Kind regards,

Jeroen van Meeuwen
-kanarip

[Jeroen van Meeuwen]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Jeroen van Meeuwen wrote:
>  Jeremy Katz wrote:
> > On Mon, 2007-04-16 at 17:31 +0200, Jeroen van Meeuwen wrote:
> >> Attached is a patch to customize the build_dir, yum cachedir and yum
> >> installroot.
> >
> > build dir and cachedir make sense to me[1], but what's the value in
> > setting install_root explicitly?  And as it stands, you're not even
> > using the value since there are lots of other places where we expect
> > that the install root is builddir/install_root.
> >
>   
In an attempt to move forward on this, I'll try and keep in pace with
what you tell me.

Correct me if I'm wrong, but I understand your view is to either:

- - specify the install_root separately and use it all over the script, or

- - not allow to modify it at all and basically let the builddir setting
specify where the (subdir) install_root is exactly

The first of which I'm thinking has the most flexibility. If I was to
propose a patch doing exactly that, is there anything else you want me
to keep in mind?

Kind regards,

Jeroen van Meeuwen
- -kanarip
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.7 (GNU/Linux)
> Comment: Using GnuPG with Fedora - http://enigmail.mozdev.org
>
> iD8DBQFGJmRhKN6f2pNCvwgRAkk7AKDWy/jee+OoGx+PxbBaRonkw8k6bACfSBa9
> ZRsCNSglW68u6BxiyqZUa7o=
> =1mf8
> -----END PGP SIGNATURE-----