1 |
From 926c42c264e2fdb2987e145ae848fccfaa51be39 Mon Sep 17 00:00:00 2001 |
2 |
From: Brian Dolbec <dolsen@g.o> |
3 |
Date: Thu, 9 Mar 2017 01:24:22 -0800 |
4 |
Subject: [PATCH 6/7] defaults.py: Update all repository, DISTDIR, PKGDIR |
5 |
settings to new /var paths |
6 |
To: gentoo-catalyst@l.g.o |
7 |
|
8 |
All settings are still configurable in catalyst.conf. |
9 |
These are new reasonable settings for a relocated tree system. |
10 |
A user can still set their own locations during install, or at a later time. |
11 |
|
12 |
Default catalyst.conf settings will be changed at a later time after additional testing and |
13 |
the automatic stage building scripts have been updated. |
14 |
--- |
15 |
catalyst/defaults.py | 22 +++++++++++----------- |
16 |
1 file changed, 11 insertions(+), 11 deletions(-) |
17 |
|
18 |
diff --git a/catalyst/defaults.py b/catalyst/defaults.py |
19 |
index 84ed2822..947e236c 100644 |
20 |
--- a/catalyst/defaults.py |
21 |
+++ b/catalyst/defaults.py |
22 |
@@ -39,24 +39,24 @@ confdefaults={ |
23 |
"compressor_options": XATTRS_OPTIONS[TAR], |
24 |
"decomp_opt": DECOMPRESSOR_PROGRAM_OPTIONS[TAR], |
25 |
"decompressor_search_order": DECOMPRESSOR_SEARCH_ORDER, |
26 |
- "distdir": "/usr/portage/distfiles", |
27 |
+ "distdir": "/var/portage/distfiles", |
28 |
"hash_function": "crc32", |
29 |
"icecream": "/var/cache/icecream", |
30 |
'list_xattrs_opt': LIST_XATTRS_OPTIONS[TAR], |
31 |
- "local_overlay": "/usr/local/portage", |
32 |
+ "local_overlay": "/var/portage/repos/local", |
33 |
"port_conf": "/etc/portage", |
34 |
"make_conf": "%(port_conf)s/make.conf", |
35 |
"options": set(), |
36 |
- "packagedir": "/usr/portage/packages", |
37 |
- "portdir": "/usr/portage", |
38 |
+ "packagedir": "/var/portage/packages", |
39 |
+ "portdir": "/var/portage/repos", |
40 |
"port_tmpdir": "/var/tmp/portage", |
41 |
"PythonDir": "./catalyst", |
42 |
- "repo_basedir": "/usr", |
43 |
- "repo_name": "portage", |
44 |
+ "repo_basedir": "/var/portage/repos", |
45 |
+ "repo_name": "gentoo", |
46 |
"sharedir": "/usr/share/catalyst", |
47 |
"shdir": "/usr/share/catalyst/targets/", |
48 |
"snapshot_cache": "/var/tmp/catalyst/snapshot_cache", |
49 |
- "snapshot_name": "portage-", |
50 |
+ "snapshot_name": "%(repo_name)s-", |
51 |
"source_matching": "strict", |
52 |
"storedir": "/var/tmp/catalyst", |
53 |
"target_distdir": "/var/portage/distfiles", |
54 |
@@ -75,8 +75,8 @@ TARGET_MOUNT_DEFAULTS = { |
55 |
"distdir": "/usr/portage/distfiles", |
56 |
"icecream": "/usr/lib/icecc/bin", |
57 |
"kerncache": "/tmp/kerncache", |
58 |
- "packagedir": "/usr/portage/packages", |
59 |
- "portdir": "/usr/portage", |
60 |
+ "packagedir": "/var/portage/packages", |
61 |
+ "portdir": "/var/portage/repos", |
62 |
"port_tmpdir": "/var/tmp/portage", |
63 |
"port_logdir": "/var/log/portage", |
64 |
"proc": "/proc", |
65 |
@@ -86,8 +86,8 @@ TARGET_MOUNT_DEFAULTS = { |
66 |
SOURCE_MOUNT_DEFAULTS = { |
67 |
"dev": "/dev", |
68 |
"devpts": "/dev/pts", |
69 |
- "distdir": "/usr/portage/distfiles", |
70 |
- "portdir": "/usr/portage", |
71 |
+ "distdir": "/var/portage/distfiles", |
72 |
+ "portdir": "/var/portage/repos", |
73 |
"port_tmpdir": "tmpfs", |
74 |
"proc": "/proc", |
75 |
"shm": "shmfs", |
76 |
-- |
77 |
2.12.0 |
78 |
|
79 |
|
80 |
|
81 |
-- |
82 |
Brian Dolbec <dolsen> |