Gentoo Archives: gentoo-catalyst

From: Brian Dolbec <dolsen@g.o>
To: gentoo-catalyst@l.g.o
Subject: Re: [gentoo-catalyst] [PATCH 2/2] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary
Date: Thu, 19 Dec 2013 07:34:54
Message-Id: 1387438476.3897.222.camel@big_daddy.dol-sen.ca
In Reply to: Re: [gentoo-catalyst] [PATCH 2/2] modules/generic_stage_target.py, modules/stage1_target.py: Add a target_mounts dictionary by "W. Trevor King"
1 On Tue, 2013-12-17 at 21:35 -0800, W. Trevor King wrote:
2 > On Tue, Dec 17, 2013 at 09:18:04PM -0800, Brian Dolbec wrote:
3 > > On Tue, 2013-12-17 at 19:28 -0800, W. Trevor King wrote:
4 > > > On Tue, Dec 17, 2013 at 05:07:27PM -0800, Brian Dolbec wrote:
5
6 > > > > - self.mounts.append("/var/log/portage")
7 > > > > - self.mountmap["/var/log/portage"]=self.settings["port_logdir"]
8 > > > > - self.env["PORT_LOGDIR"]="/var/log/portage"
9 > > > > + self.mounts.append("port_logdir")
10 > > > > + self.mountmap["port_logdir"]=self.settings["port_logdir"]
11 > > > > + self.env["PORT_LOGDIR"]=self.settings["port_logdir"]
12 > > >
13
14 > > > I also think that the PORT_LOGDIR environment variable
15 > > > should be:
16 > > >
17 > > > self.env["PORT_LOGDIR"] = self.target_mounts["port_logdir"]
18
19 > I don't care about caps, I was trying to fix settings → target_mounts,
20 > since settings holds the mount source ;).
21 >
22 > Cheers,
23 > Trevor
24 >
25
26 No, this code block is adding it to the environment if defined in
27 settings. This patch was just removing the hard coded paths.
28
29 This is the full if block:
30
31 if "port_logdir" in self.settings:
32 self.mounts.append("port_logdir")
33 self.mountmap["port_logdir"]=self.settings["port_logdir"]
34 self.env["PORT_LOGDIR"]=self.settings["port_logdir"]
35 self.env["PORT_LOGDIR_CLEAN"]='find "${PORT_LOGDIR}" -type f ! -name "summary.log*" -mtime +30 -delete'
36
37 So far it is not used from the new TARGET_MOUNTS_DEFAULTS.
38 It is so far only enabled if uncommented and defined in catalyst.conf or
39 from the cli.
40
41 Should I remove it from the TARGET_MOUNTS_DEFAULTS for the time being?
42 --
43 Brian Dolbec <dolsen@g.o>

Attachments

File name MIME type
signature.asc application/pgp-signature

Replies