github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-05-05 07:43:42 +00:00
Code Releases Activity

Merge branch 'lib-vs-share'

Browse Source
This commit is contained in:
Axel Beckert
2013-04-11 19:49:53 +02:00
parent e9d8bd0896 555ce383d3
commit 6871954f6e
61 changed files with 178 additions and 171 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bin/xen-create-image
View File

@@ -1441,9 +1441,9 @@ sub checkOption
message => "takes a suffixed (mb, MB, G, k, etc.) integer.\n",
},
distribution => {
check => sub { -d "/usr/lib/xen-tools/$_[0].d" },
check => sub { -d "/usr/share/xen-tools/$_[0].d" },
message => "takes a distribution name " .
"(see /usr/lib/xen-tools for valid values).\n",
"(see /usr/share/xen-tools for valid values).\n",
},
imageType => {
check => qr/^sparse|full$/,

6
bin/xt-customize-image
View File

@@ -54,7 +54,7 @@ xt-customize-image - Customize a freshly installed copy of GNU/Linux
the --location option.
For the distribution named 'foo' the scripts will be loaded and
executed from '/usr/lib/xen-tools/foo.d'. Each executable will
executed from '/usr/share/xen-tools/foo.d'. Each executable will
be loaded and executed in sorted order.
=cut
@@ -215,7 +215,7 @@ sub checkArguments
# If there are no scripts then we clearly cannot
# customise it!
#
my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
if ( !-d $dir )
{
@@ -257,7 +257,7 @@ sub runDistributionHooks
#
# Hook directory.
#
my $hooks = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
my $hooks = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d/";
#
# Installation prefix

2
bin/xt-install-image
View File

@@ -415,7 +415,7 @@ sub checkArguments
# If there are no scripts then we clearly cannot
# customise it!
#
my $dir = "/usr/lib/xen-tools/" . $CONFIG{ 'dist' } . ".d";
my $dir = "/usr/share/xen-tools/" . $CONFIG{ 'dist' } . ".d";
if ( !-d $dir )
{