aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2015-08-30 01:28:03 +0000
committerJorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>2015-08-30 01:28:03 +0000
commit27a8732039fdd2102cd216f421f66c58c905e693 (patch)
tree28f13a27a24dae4637e81073d62be297bf7a3e97
parentsetup.py: Fix rebase errors causing the lib/catalyst files to not be installed (diff)
downloadcatalyst-27a8732039fdd2102cd216f421f66c58c905e693.tar.gz
catalyst-27a8732039fdd2102cd216f421f66c58c905e693.tar.bz2
catalyst-27a8732039fdd2102cd216f421f66c58c905e693.zip
Update sharedir location from /usr/lib/catalyst to /usr/share/catalyst.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto@gentoo.org>
-rw-r--r--README2
-rw-r--r--catalyst/defaults.py4
-rw-r--r--doc/catalyst-config.5.txt4
-rw-r--r--doc/catalyst-spec.5.txt4
-rw-r--r--etc/catalyst.conf2
-rw-r--r--examples/livecd-stage2_template.spec2
-rw-r--r--examples/netboot_template.spec2
-rwxr-xr-xsetup.py4
8 files changed, 12 insertions, 12 deletions
diff --git a/README b/README
index 0674e07..0a0373c 100644
--- a/README
+++ b/README
@@ -54,7 +54,7 @@ Example catalyst.conf:
distdir="/usr/portage/distfiles"
options="pkgcache kerncache"
-sharedir="/usr/lib/catalyst"
+sharedir="/usr/share/catalyst"
There are many more options that can be set, but those defaults are good
for out of the box operation. For more documentation on what you can do
diff --git a/catalyst/defaults.py b/catalyst/defaults.py
index 2f4f429..5cb5e3f 100644
--- a/catalyst/defaults.py
+++ b/catalyst/defaults.py
@@ -33,8 +33,8 @@ confdefaults={
"port_tmpdir": "/var/tmp/portage",
"PythonDir": "./catalyst",
"repo_name": "portage",
- "sharedir": "/usr/lib/catalyst",
- "shdir": "/usr/lib/catalyst/targets/",
+ "sharedir": "/usr/share/catalyst",
+ "shdir": "/usr/share/catalyst/targets/",
"snapshot_cache": "/var/tmp/catalyst/snapshot_cache",
"snapshot_name": "portage-",
"storedir": "/var/tmp/catalyst",
diff --git a/doc/catalyst-config.5.txt b/doc/catalyst-config.5.txt
index 63a015f..61f3d93 100644
--- a/doc/catalyst-config.5.txt
+++ b/doc/catalyst-config.5.txt
@@ -30,7 +30,7 @@ distdir="/usr/portage/distfiles"
envscript="/etc/catalyst/catalystrc"
options="autoresume bindist kerncache pkgcache seedcache snapcache"
portdir="/usr/portage"
-sharedir="/usr/lib/catalyst"
+sharedir="/usr/share/catalyst"
snapshot_cache="/var/tmp/catalyst/snapshot_cache"
storedir="/var/tmp/catalyst"
---------------------------------
@@ -145,7 +145,7 @@ Portage tree location. `/usr/portage/` should work for most default
installations.
*sharedir*::
-Catalyst runtime script location. `/usr/lib/catalyst` should work for
+Catalyst runtime script location. `/usr/share/catalyst` should work for
most default installations. If you are running catalyst from a Git
checkout, you should change this to point to your checkout directory.
diff --git a/doc/catalyst-spec.5.txt b/doc/catalyst-spec.5.txt
index b3e2bf5..cba3166 100644
--- a/doc/catalyst-spec.5.txt
+++ b/doc/catalyst-spec.5.txt
@@ -210,7 +210,7 @@ The cdtar is essentially the bootloader for the CD. It also holds the
main configuration for the bootloader. On x86/amd64, it also can
include a small memory testing application, called memtest86+
(example:
-`/usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2`).
+`/usr/share/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2`).
Kernel and boot issues
~~~~~~~~~~~~~~~~~~~~~~
@@ -312,7 +312,7 @@ supported by the `netboot` and `netboot2` targets.
*netboot/base_tarball*::
This is the full path and filename to the tarball to use as the base
for the netboot image (example:
-`/usr/lib/catalyst/netboot/netboot-base.tar.bz2`).
+`/usr/share/catalyst/netboot/netboot-base.tar.bz2`).
Runlevels
~~~~~~~~~
diff --git a/etc/catalyst.conf b/etc/catalyst.conf
index 01708e7..7f56671 100644
--- a/etc/catalyst.conf
+++ b/etc/catalyst.conf
@@ -78,7 +78,7 @@ portdir="/usr/portage"
# sharedir specifies where all of the catalyst runtime executables
# and other shared lib objects are.
# Most users do not need to change this.
-sharedir="/usr/lib/catalyst"
+sharedir="/usr/share/catalyst"
# shdir specifies where all of the catalyst runtime executables are.
shdir="%(sharedir)s/targets"
diff --git a/examples/livecd-stage2_template.spec b/examples/livecd-stage2_template.spec
index ca1ca82..c2c6bf3 100644
--- a/examples/livecd-stage2_template.spec
+++ b/examples/livecd-stage2_template.spec
@@ -103,7 +103,7 @@ livecd/fsops:
# configuration for the bootloader. On x86/amd64, it also can include a small
# memory testing application, called memtest86+.
# example:
-# livecd/cdtar: /usr/lib/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2
+# livecd/cdtar: /usr/share/catalyst/livecd/cdtar/isolinux-2.13-memtest86+-cdtar.tar.bz2
livecd/cdtar:
# This is the full path and filename to the ISO image that the livecd-stage2
diff --git a/examples/netboot_template.spec b/examples/netboot_template.spec
index 921ddf4..d10b645 100644
--- a/examples/netboot_template.spec
+++ b/examples/netboot_template.spec
@@ -114,7 +114,7 @@ netboot/busybox_config:
# This is the full path and filename to the tarball to use as the base for the
# netboot image.
# example:
-# netboot/base_tarball: /usr/lib/catalyst/netboot/netboot-base.tar.bz2
+# netboot/base_tarball: /usr/share/catalyst/netboot/netboot-base.tar.bz2
netboot/base_tarball:
# These are the packages that will be built for your netboot image using the USE
diff --git a/setup.py b/setup.py
index 1d421bc..3eb76d7 100755
--- a/setup.py
+++ b/setup.py
@@ -48,8 +48,8 @@ _data_files = [('/etc/catalyst', ['etc/catalyst.conf','etc/catalystrc']),
('/usr/share/man/man1', ['files/catalyst.1']),
('/usr/share/man/man5', ['files/catalyst-config.5', 'files/catalyst-spec.5'])
]
-_data_files.extend(_files('lib/catalyst/livecd', 'livecd'))
-_data_files.extend(_files('lib/catalyst/targets', 'targets'))
+_data_files.extend(_files('share/catalyst/livecd', 'livecd'))
+_data_files.extend(_files('share/catalyst/targets', 'targets'))
class set_version(_Command):