1
0
mirror of synced 2026-02-20 22:05:15 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
Axel Beckert
cc2a6d4e41 Change all occurrences of $prefix in hooks and roles with $TARGET
"target" is also the name used in the debian installer for the
installation target while "prefix" is too ambiguous.
2013-04-18 21:01:19 +02:00
70 changed files with 505 additions and 532 deletions

View File

@@ -32,3 +32,12 @@ Bugs to fix rather soon
Current (unreleased) fix is to sort by mountpoint length. Current (unreleased) fix is to sort by mountpoint length.
Fix would be to reproduce what mount does with mount `-a`. Fix would be to reproduce what mount does with mount `-a`.
Bugs to fix later
-----------------
`t/xen-tools.t` can't really test Xen::Tools as the latter requires a
local Xen installation. For proper testing, a dummy set of Xen
configuration files and configurable paths to them in `Xen::Tools`
would be necessary.

View File

@@ -14,7 +14,7 @@
# #
TMP ?= /tmp TMP ?= /tmp
DIST_PREFIX = ${TMP} DIST_PREFIX = ${TMP}
VERSION = 4.4beta1 VERSION = 4.4~dev
DEBVERSION = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/') DEBVERSION = $(shell echo $(VERSION)|sed 's/\(rc\|pre\|beta\|alpha\)/~\1/')
BASE = xen-tools BASE = xen-tools
VCS = git VCS = git
@@ -201,7 +201,6 @@ install-hooks:
-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d precise.d
-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d
-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d
-cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d saucy.d
cp hooks/common.sh ${prefix}/usr/share/xen-tools cp hooks/common.sh ${prefix}/usr/share/xen-tools
cp -r hooks/common ${prefix}/usr/share/xen-tools cp -r hooks/common ${prefix}/usr/share/xen-tools

View File

@@ -32,9 +32,9 @@ known to work reliably, i.e.:
* Etch 4.0 (Dom0 no more tested) * Etch 4.0 (Dom0 no more tested)
* Lenny 5.0 * Lenny 5.0
* Squeeze 6.0 * Squeeze 6.0
* Wheezy 7 * Wheezy 7.0
* Jessie 8 (under developement) * Jessie 8.0 (preliminary support as it's not yet available)
* Sid (always under developement; works at least at the moment of writing :-) * Sid (works at least at the moment of writing :-)
### Ubuntu ### Ubuntu
@@ -54,8 +54,7 @@ known to work reliably, i.e.:
* Oneiric Ocelot 11.10 * Oneiric Ocelot 11.10
* Precise Pangolin 12.04 * Precise Pangolin 12.04
* Quantal Quetzal 12.10 * Quantal Quetzal 12.10
* Raring Ringtail 13.04 * Raring Ringtail 13.04 (preliminary support as it's not yet available)
* Saucy Salamander 13.10 (under developement)
[1]: http://bugs.debian.org/659360 [1]: http://bugs.debian.org/659360
"debootstrap in Wheezy can no more build Ubuntu Edgy or earlier" "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier"
@@ -84,22 +83,11 @@ Requirements
To use these tools you'll need the following software: To use these tools you'll need the following software:
* [debootstrap](http://packages.debian.org/debootstrap) * [debootstrap](http://packages.debian.org/debootstrap)
* Perl and the following Perl modules * Perl
* [Config::IniFiles](http://metacpan.org/release/Config-IniFiles) * The Perl module [Text::Template](http://search.cpan.org/dist/Text-Template/)
([Debian Package libconfig-inifiles-perl](http://packages.debian.org/libconfig-inifiles-perl))
* [Text::Template](http://metacpan.org/release/Text-Template)
([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl)) ([Debian Package libtext-template-perl](http://packages.debian.org/libtext-template-perl))
* [Data::Validate::Domain](http://metacpan.org/release/Data-Validate-Domain) * The Perl module [Config::IniFiles](http://search.cpan.org/dist/Config-IniFiles/)
([Debian Package libdata-validate-domain-perl](http://packages.debian.org/libdata-validate-domain-perl)) ([Debian Package libconfig-inifiles-perl](http://packages.debian.org/libconfig-inifiles-perl))
* [Data::Validate::IP](http://metacpan.org/release/Data-Validate-IP)
([Debian Package libdata-validate-ip-perl](http://packages.debian.org/libdata-validate-ip-perl))
* [Data::Validate::URI](http://metacpan.org/release/Data-Validate-URI)
([Debian Package libdata-validate-uri-perl](http://packages.debian.org/libdata-validate-uri-perl))
* [File::Slurp](http://metacpan.org/release/File-Slurp)
([Debian Package libfile-slurp-perl](http://packages.debian.org/libfile-slurp-perl))
* [File::Which](http://metacpan.org/release/File-Which)
([Debian Package libfile-which-perl](http://packages.debian.org/libfile-which-perl))
* and some more modules which are part of the Perl core and hence do not need to be installed separately.
* Make, if you are not installing through a package manager * Make, if you are not installing through a package manager
You can try to install RPM-based distributions such as CentOS, or You can try to install RPM-based distributions such as CentOS, or

View File

@@ -73,6 +73,12 @@ Bugs to fix and features to add for 5.0
* LVM snapshot support as an install source. * LVM snapshot support as an install source.
* Clean up mounts on `Ctrl-C`, causes error while installing otherwise:
Removing /dev/vg0/acromantula-domu1-disk - since we're forcing the
install Can't remove open logical volume "acromantula-domu1-disk"
this should be a matter of unmounting the mounted volume from /tmp.
* Generic grub support * Generic grub support
This will generate a much nicer `menu.lst` as a side effect, as its This will generate a much nicer `menu.lst` as a side effect, as its
@@ -122,9 +128,6 @@ Bugs to fix and features to add for 5.0
`authorized_keys` (e.g. a users public key) or to just add the Dom0's `authorized_keys` (e.g. a users public key) or to just add the Dom0's
`/root/.ssh/authorized_keys` as the DomU's one. `/root/.ssh/authorized_keys` as the DomU's one.
* Generate ECDSA host keys where possible. (Likely depends on the
to-be-installed SSH version.)
* More generic roles * More generic roles
Deploy a web server or setup ssmtp directly via flag when setting up Deploy a web server or setup ssmtp directly via flag when setting up
@@ -162,6 +165,11 @@ Bugs to fix and features to add for 5.0
* Make used Xen toolstack configurable, i.e. via --xen-toolstack=xl * Make used Xen toolstack configurable, i.e. via --xen-toolstack=xl
* Code Deduplication / Refactor the code for less code duplication
`bin/x*` currently contain the same or similar code like e.g. in the
function readConfigurationFile. This needs to be cleaned up.
* Unify --debug and --dumpconfig. Likely make --debug exit * Unify --debug and --dumpconfig. Likely make --debug exit
gracefully. Document --debug if --dumpconfig is removed. gracefully. Document --debug if --dumpconfig is removed.
@@ -174,6 +182,8 @@ Bugs to fix and features to add for 5.0
distributions the same. Currently Debian is a special case and distributions the same. Currently Debian is a special case and
Ubuntu half a special case. Ubuntu half a special case.
* Replace findBinary() with File::Which
* Remove from the (unused) Xen::Tools what's already in the used * Remove from the (unused) Xen::Tools what's already in the used
Xen::Tools::Common. Xen::Tools::Common.
@@ -184,10 +194,6 @@ Bugs to fix and features to add for 5.0
`xen-create-image` first. Which probably both would be a good `xen-create-image` first. Which probably both would be a good
idea. idea.
* Replace several occurences of backticks with runCommand. (Mostly
mount commands in `xen-update-image`. The calls to uname or
lsb_release should be fine.)
Stuff from Steve's TODO list / Generic TODOs Stuff from Steve's TODO list / Generic TODOs
-------------------------------------------- --------------------------------------------
@@ -232,14 +238,10 @@ Axel's Break-Backwards-Compatibility Wishlist
Maybe add some `--autostart` or such. Maybe add some `--autostart` or such.
* Maybe replace findBinary with File::Which
* MAC addresses should no more depend on the distribution. * MAC addresses should no more depend on the distribution.
* Let the admin switch between MAC addresses based on XenSource's OUI, * Let the admin switch between MAC addresses based on XenSource's OUI,
its organisation's own OUI or locally administrated MAC addresses. its organisation's own OUI or locally administrated MAC addresses.
See also http://wiki.xen.org/wiki/Xen_Networking#MAC_addresses See also http://wiki.xen.org/wiki/Xen_Networking#MAC_addresses
* More radical Code Deduplication
`bin/x*` currently still contain similar code like e.g. in the
function parseCommandLineArguments. This should be cleaned up, too,
but may need a bigger redesign.

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xen-create-image - Easily create new Xen instances with networking and OpenSSH. xen-create-image - Easily create new Xen instances with networking and OpenSSH.
@@ -245,10 +243,9 @@ and EVMS EXAMPLE.
Debian mirror. See http://http.debian.net/ for Debian mirror. See http://http.debian.net/ for
details. details.
--apt_proxy=protocol://hostname:port/ --apt_proxy=url
Specify a proxy to be used by debootstrap, and within Specify a proxy to be used by debootstrap, and within
the guest. Needs the same syntax as APT's the guest.
Acquire::http::Proxy. See apt.conf(5).
--template=tmpl --template=tmpl
Specify which template file to use when creating the Specify which template file to use when creating the
@@ -795,9 +792,6 @@ use File::Which;
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
use Data::Dumper; use Data::Dumper;
use Data::Validate::URI qw/ is_uri /;
use Data::Validate::IP qw/ is_ipv4 /;
use Data::Validate::Domain qw/ is_hostname /;
use Xen::Tools::Common; use Xen::Tools::Common;
@@ -831,7 +825,7 @@ my $MOUNT_POINT = undef;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';
# #
@@ -1149,11 +1143,11 @@ E_O_ERROR
# Check that all the binaries have been installed properly # Check that all the binaries have been installed properly
# #
my @required = my @required =
qw(xt-customize-image xt-install-image xt-create-xen-config); qw ( / xt-customize-image xt-install-image xt-create-xen-config / );
foreach my $bin (@required) foreach my $bin (@required)
{ {
if ( !defined( which($bin) ) ) if ( !defined( findBinary($bin) ) )
{ {
logprint( "The script '$bin' was not found.\nAborting\n\n" ); logprint( "The script '$bin' was not found.\nAborting\n\n" );
$CONFIG{'FAIL'} = 1; $CONFIG{'FAIL'} = 1;
@@ -1334,10 +1328,10 @@ sub setupDefaultOptions
$CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian-archive/debian'; $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian-archive/debian';
} }
# Initialize per distribution mirror defaults: Ubuntu # Initialize per distribution mirror defaults: Ubuntu
foreach my $ubuntudist (qw(lucid precise quantal raring saucy)) { foreach my $ubuntudist (qw(hardy lucid oneiric precise quantal raring)) {
$CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu'; $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
} }
foreach my $ubuntudist (qw(dapper edgy feisty gutsy hardy intrepid jaunty karmic maverick natty oneiric)) { foreach my $ubuntudist (qw(dapper edgy feisty gutsy intrepid jaunty karmic maverick natty)) {
$CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu'; $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
} }
$CONFIG{ 'apt_proxy' } = ''; $CONFIG{ 'apt_proxy' } = '';
@@ -1456,15 +1450,15 @@ sub checkOption
message => "must be a disk device (xvd[a-z]+, sd[a-z]+).\n", message => "must be a disk device (xvd[a-z]+, sd[a-z]+).\n",
}, },
ipv4 => { ipv4 => {
check => sub { is_ipv4($_[0]) }, check => qr/^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/,
message => "must be valid IPv4.\n", message => "must be valid IPv4.\n",
}, },
ipv4_or_auto => { ipv4_or_auto => {
check => sub { is_ipv4($_[0]) or $_[0] eq 'auto' }, check => qr/^(?:auto|(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?))$/,
message => "must be valid IPv4 or the keyword 'auto'.\n", message => "must be valid IPv4 or the keyword 'auto'.\n",
}, },
hostname => { hostname => {
check => sub { is_hostname($_[0]) }, check => qr/^[a-z0-9][a-z0-9.-]{0,254}$/i,
message => "must be a valid hostname.\n", message => "must be a valid hostname.\n",
}, },
supportedFs => { supportedFs => {
@@ -1495,10 +1489,6 @@ sub checkOption
check => qr/^md5|sha256|sha512$/i, check => qr/^md5|sha256|sha512$/i,
message => "must be md5, sha256 or sha512.\n", message => "must be md5, sha256 or sha512.\n",
}, },
uri => {
check => sub { is_uri($_[0]) },
message => "must be an URI including the protocol\n",
},
); );
# Define what argument each option accepts. # Define what argument each option accepts.
@@ -1533,7 +1523,6 @@ sub checkOption
mac => 'mac', mac => 'mac',
ip => 'ipv4_or_auto', ip => 'ipv4_or_auto',
hash_method => 'hashMethod', hash_method => 'hashMethod',
apt_proxy => 'uri',
); );
# If given option does not exists in optionsTypes, # If given option does not exists in optionsTypes,
@@ -1828,7 +1817,7 @@ sub checkArguments
# #
# Lucid and probably all later Ubuntus, too, don't work without pygrub # Lucid and probably all later Ubuntus, too, don't work without pygrub
# #
if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal|raring|saucy/ ) if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal|raring/ )
{ {
$CONFIG{ 'pygrub' } = 1; $CONFIG{ 'pygrub' } = 1;
} }
@@ -2276,7 +2265,7 @@ sub checkBinariesPresent
foreach my $file (@required) foreach my $file (@required)
{ {
if ( !defined( which($file) ) ) if ( !defined( findBinary($file) ) )
{ {
logprint("The following binary is required to run this tool\n"); logprint("The following binary is required to run this tool\n");
logprint("\t$file\n"); logprint("\t$file\n");
@@ -2292,7 +2281,7 @@ sub checkBinariesPresent
{ {
# loopback image # loopback image
if ( !defined( which("dd") ) ) if ( !defined( findBinary("dd") ) )
{ {
logprint("The following binary is required to run this tool\n"); logprint("The following binary is required to run this tool\n");
logprint("\tdd\n"); logprint("\tdd\n");
@@ -2313,7 +2302,7 @@ sub checkBinariesPresent
foreach my $file (@evms) foreach my $file (@evms)
{ {
if ( !defined( which($file) ) ) if ( !defined( findBinary($file) ) )
{ {
logprint("The following binary is required to run this tool\n"); logprint("The following binary is required to run this tool\n");
logprint("\t$file\n"); logprint("\t$file\n");
@@ -2333,7 +2322,7 @@ sub checkBinariesPresent
foreach my $file (@lvm) foreach my $file (@lvm)
{ {
if ( !defined( which($file) ) ) if ( !defined( findBinary($file) ) )
{ {
logprint("The following binary is required to run this tool\n"); logprint("The following binary is required to run this tool\n");
logprint("\t$file\n"); logprint("\t$file\n");
@@ -3307,7 +3296,7 @@ sub createFilesystem
# #
my ($binary, $args) = split(/ /, $command, 2); my ($binary, $args) = split(/ /, $command, 2);
if ( !defined( which($binary) ) ) if ( !defined( findBinary($binary) ) )
{ {
logprint( logprint(
"The binary '$binary' required to create the filesystem $fs is missing\n" "The binary '$binary' required to create the filesystem $fs is missing\n"

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xen-create-nfs - Create a Xen configuration file for an NFS-root guest. xen-create-nfs - Create a Xen configuration file for an NFS-root guest.
@@ -121,7 +119,7 @@ $CONFIG{ 'template' } = '/etc/xen-tools/xm-nfs.tmpl';
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';
# store version number away. # store version number away.

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xen-delete-image - Delete previously created Xen instances. xen-delete-image - Delete previously created Xen instances.
@@ -163,7 +161,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';
# #

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xen-list-images - List all the created and configured Xen images. xen-list-images - List all the created and configured Xen images.
@@ -106,7 +104,7 @@ $CONFIG{ 'extension' } = '.cfg';
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xen-resize-guest - Resize a loopback or LVM based xen guest. xen-resize-guest - Resize a loopback or LVM based xen guest.
@@ -111,7 +109,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';
# #

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xen-update-image - Update the software installed upon offline Xen images. xen-update-image - Update the software installed upon offline Xen images.
@@ -113,7 +111,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';
# #

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xt-create-config - Create a Xen configuration file for a new guest xt-create-config - Create a Xen configuration file for a new guest
@@ -148,7 +146,7 @@ $CONFIG{ 'extension' } = '.cfg';
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xt-customize-image - Customize a freshly installed copy of GNU/Linux xt-customize-image - Customize a freshly installed copy of GNU/Linux
@@ -91,7 +89,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xt-guess-suite-and-mirror - Tries to guess the most suitable suite and xt-guess-suite-and-mirror - Tries to guess the most suitable suite and
@@ -71,7 +69,6 @@ my @sources_list_files = ( '/etc/apt/sources.list',
use File::Slurp; use File::Slurp;
use Getopt::Long; use Getopt::Long;
use Pod::Usage; use Pod::Usage;
use File::Which;
use strict; use strict;
@@ -79,7 +76,7 @@ use strict;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';
# Init # Init
my $mirror = ''; my $mirror = '';
@@ -151,8 +148,10 @@ all_sources_list_files: foreach my $sources_list_file (@sources_list_files) {
die "Couldn't find a useful entry in the sources.list files of the Dom0. Tried:\n ". die "Couldn't find a useful entry in the sources.list files of the Dom0. Tried:\n ".
join("\n ", @sources_list_files)."\n" unless $found; join("\n ", @sources_list_files)."\n" unless $found;
my $lsb_release = which('lsb_release'); my $lsb_release = `which lsb_release`;
if (!$found and defined($lsb_release) and -x $lsb_release) { chomp($lsb_release);
if (!$found and $lsb_release and -x $lsb_release) {
my $vendor = `$lsb_release -s -i`; my $vendor = `$lsb_release -s -i`;
if ($vendor eq 'Debian' or $vendor eq 'Ubuntu') { if ($vendor eq 'Debian' or $vendor eq 'Ubuntu') {

View File

@@ -1,7 +1,5 @@
#!/usr/bin/perl -w #!/usr/bin/perl -w
=encoding utf8
=head1 NAME =head1 NAME
xt-install-image - Install a fresh copy of GNU/Linux into a directory xt-install-image - Install a fresh copy of GNU/Linux into a directory
@@ -112,7 +110,7 @@ my %CONFIG;
# #
# Release number. # Release number.
# #
my $RELEASE = '4.4beta1'; my $RELEASE = '4.4~dev';
# #

4
debian/NEWS vendored
View File

@@ -1,4 +1,4 @@
xen-tools (4.4~beta1-1) unstable; urgency=low xen-tools (4.4~dev-1) UNRELEASED; urgency=low
* Exported environment variables no more contain dashes ("-"). Dashes in * Exported environment variables no more contain dashes ("-"). Dashes in
environment variable names are from now on converted to underscores environment variable names are from now on converted to underscores
@@ -11,7 +11,7 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
which all should be empty at that point, i.e. "rmdir -p which all should be empty at that point, i.e. "rmdir -p
/usr/lib/xen-tools/*" should do the trick. /usr/lib/xen-tools/*" should do the trick.
-- Axel Beckert <abe@debian.org> Fri, 23 Aug 2013 19:01:16 +0200 -- Axel Beckert <abe@debian.org> Fri, 05 Apr 2013 20:19:02 +0200
xen-tools (4.2~rc1-1) unstable; urgency=low xen-tools (4.2~rc1-1) unstable; urgency=low

28
debian/changelog vendored
View File

@@ -1,6 +1,6 @@
xen-tools (4.4~beta1-1) unstable; urgency=low xen-tools (4.4~dev-1) UNRELEASED; urgency=low
* New upstream beta release * New upstream release
- Code deduplication to unify the xen-*-image scripts - Code deduplication to unify the xen-*-image scripts
- Moves /usr/lib/xen-tools/ to /usr/share/xen-tools/ - Moves /usr/lib/xen-tools/ to /usr/share/xen-tools/
- Use http.debian.net as default Debian mirror if no mirror is given - Use http.debian.net as default Debian mirror if no mirror is given
@@ -20,17 +20,14 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
- Fixes "--extension=" with empty parameter. - Fixes "--extension=" with empty parameter.
- Sarge amd64 case handle properly - Sarge amd64 case handle properly
- Remove CVS revisions from --version output - Remove CVS revisions from --version output
- Support for Debian Jessie, Ubuntu Raring and preliminary support for - Preliminary support for Debian Jessie and Ubuntu Raring
Ubuntu Saucy (debootstrap doesn't have support for Saucy at the time
of writing)
- Preliminary support for xl toolstack - Preliminary support for xl toolstack
- xen-create-image: Consistently use runCommand() instead of system() - xen-create-image: Consistently use runCommand() instead of system()
- xt-install-image: Don't bail out if only cdebootstrap is installed - xt-install-image: Don't bail out if only cdebootstrap is installed
but not debootstrap (Thanks Elmar Heeb!) but not debootstrap (Thanks Elmar Heeb!)
- Makefile accepts DESTDIR=… - Makefile accepts DESTDIR=…
- Move examples from debian/examples to examples. - Move examples from debian/examples to examples.
- Uses File::Which exclusively (no more findBinary, no more `which`), - Uses File::Which, added (build-) dependency on libfile-which-perl
added (build-) dependency on libfile-which-perl
- Knows about module-init-tools → kmod transition in wheezy/raring. - Knows about module-init-tools → kmod transition in wheezy/raring.
- Adds default mount options for ext4, identical to ext2/ext3. - Adds default mount options for ext4, identical to ext2/ext3.
- Ships /etc/initramfs-tools/conf.d/xen-tools for generating Dom0 - Ships /etc/initramfs-tools/conf.d/xen-tools for generating Dom0
@@ -44,8 +41,7 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
Add installCentOS4Package wrapper for backward compatibility. Add installCentOS4Package wrapper for backward compatibility.
- Fix filesystem tools installation in 91-install-fs-tools (which was - Fix filesystem tools installation in 91-install-fs-tools (which was
broken since 4.3~rc1-1) by merging 91-install-fs-tools back into broken since 4.3~rc1-1) by merging 91-install-fs-tools back into
90-make-fstab. (Closes: #715340) Also supports RPM-based 90-make-fstab. Also supports RPM-based distributions now.
distributions now.
- Fixes export of environment variables. Previously they could contain - Fixes export of environment variables. Previously they could contain
dashes and then were only accessible from within Perl, but not from dashes and then were only accessible from within Perl, but not from
within Bash. within Bash.
@@ -55,14 +51,6 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
- Removes unused Perl modules Xen::Tools and Xen::Tools::Log from - Removes unused Perl modules Xen::Tools and Xen::Tools::Log from
source code. Also removes the according tests from the test suite. source code. Also removes the according tests from the test suite.
→ Remove no more needed build-dependency on Moose. → Remove no more needed build-dependency on Moose.
- Better documents and checks requirements for the --apt_proxy
value. (See #623443 for the corresponding apt issue.) Add (build-)
dependency on libdata-validate-uri-perl.
- Use Data::Validate::{Domain,IP} for IP addresses and hostname checks.
Add corresponding (build-) dependencies on
libdata-validate-{domain,ip}-perl.
- Fixes broken quoting in list of required binaries
- Declares POD encoding. Fixes FTBFS with Perl 5.18. (Closes: #720519)
* Add debian/gbp.conf to be able to to build xen-tools with * Add debian/gbp.conf to be able to to build xen-tools with
git-buildpackage. git-buildpackage.
* Clean up debian/rules: * Clean up debian/rules:
@@ -74,14 +62,10 @@ xen-tools (4.4~beta1-1) unstable; urgency=low
dh_auto_* can't help. No more explicitly call "make manpages", it's dh_auto_* can't help. No more explicitly call "make manpages", it's
a depedency of "make install" in the next line anyway. a depedency of "make install" in the next line anyway.
- Finally switch to a minimal dh style debian/rules. - Finally switch to a minimal dh style debian/rules.
* Bump debhelper compatibility to 9
- Update versioned debhelper build-dependency
* Bump Standards-Version to 3.9.4 (no changes)
* Add dependency on ${perl:Depends} to fix dpkg-gencontrol warning.
* Bump copyright years in debian/copyright. * Bump copyright years in debian/copyright.
* Apply wrap-and-sort. * Apply wrap-and-sort.
-- Axel Beckert <abe@debian.org> Fri, 23 Aug 2013 19:00:03 +0200 -- Axel Beckert <abe@debian.org> Thu, 17 Jan 2013 17:09:02 +0100
xen-tools (4.3.1-1) unstable; urgency=low xen-tools (4.3.1-1) unstable; urgency=low

2
debian/compat vendored
View File

@@ -1 +1 @@
9 7

19
debian/control vendored
View File

@@ -2,19 +2,16 @@ Source: xen-tools
Section: utils Section: utils
Priority: extra Priority: extra
Maintainer: Axel Beckert <abe@debian.org> Maintainer: Axel Beckert <abe@debian.org>
Build-Depends: debhelper (>= 9~), Build-Depends: debhelper (>= 7.0.0),
devscripts, devscripts,
git, git,
libdata-validate-domain-perl,
libdata-validate-ip-perl,
libdata-validate-uri-perl,
libfile-slurp-perl, libfile-slurp-perl,
libfile-which-perl, libfile-which-perl,
libtest-notabs-perl, libtest-notabs-perl,
libtest-pod-coverage-perl, libtest-pod-coverage-perl,
libtest-pod-perl, libtest-pod-perl,
libtext-template-perl libtext-template-perl
Standards-Version: 3.9.4 Standards-Version: 3.9.3
Homepage: http://xen-tools.org/software/xen-tools Homepage: http://xen-tools.org/software/xen-tools
Vcs-Browser: http://gitorious.org/xen-tools/xen-tools Vcs-Browser: http://gitorious.org/xen-tools/xen-tools
Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git Vcs-Git: git://gitorious.org/xen-tools/xen-tools.git
@@ -23,16 +20,12 @@ Package: xen-tools
Architecture: all Architecture: all
Depends: debootstrap | cdebootstrap, Depends: debootstrap | cdebootstrap,
libconfig-inifiles-perl, libconfig-inifiles-perl,
libdata-validate-domain-perl,
libdata-validate-ip-perl,
libdata-validate-uri-perl,
libfile-slurp-perl, libfile-slurp-perl,
libfile-which-perl, libfile-which-perl,
libtext-template-perl, libtext-template-perl,
openssh-client, openssh-client,
perl-modules, perl-modules,
${misc:Depends}, ${misc:Depends}
${perl:Depends}
Recommends: libexpect-perl, Recommends: libexpect-perl,
rinse (>= 1.9.1-1), rinse (>= 1.9.1-1),
xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae, xen-hypervisor-amd64 | xen-hypervisor-i386 | xen-hypervisor-i386-pae,
@@ -53,8 +46,7 @@ Description: Tools to manage Xen virtual servers
* Debian 4.0 Etch * Debian 4.0 Etch
* Debian 5.0 Lenny * Debian 5.0 Lenny
* Debian 6.0 Squeeze * Debian 6.0 Squeeze
* Debian 7 Wheezy * Debian 7.0 Wheezy
* Debian 8 Jessie (under development)
* Debian Sid (Unstable) * Debian Sid (Unstable)
* Ubuntu 6.06 Dapper Drake (LTS) * Ubuntu 6.06 Dapper Drake (LTS)
* Ubuntu 6.10 Edgy Eft * Ubuntu 6.10 Edgy Eft
@@ -69,8 +61,5 @@ Description: Tools to manage Xen virtual servers
* Ubuntu 11.04 Natty Narwhal * Ubuntu 11.04 Natty Narwhal
* Ubuntu 11.10 Oneiric Ocelot * Ubuntu 11.10 Oneiric Ocelot
* Ubuntu 12.04 Precise Pangolin (LTS) * Ubuntu 12.04 Precise Pangolin (LTS)
* Ubuntu 12.10 Quantal Quetzal
* Ubuntu 13.04 Raring Ringtail
* Ubuntu 13.10 Saucy Salamander (under development)
* CentOS 5 * CentOS 5
* CentOS 6 * CentOS 6

View File

@@ -280,7 +280,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
# mirror_edgy = http://old-releases.ubuntu.com/ubuntu # mirror_edgy = http://old-releases.ubuntu.com/ubuntu
# mirror_feisty = http://old-releases.ubuntu.com/ubuntu # mirror_feisty = http://old-releases.ubuntu.com/ubuntu
# mirror_gutsy = http://old-releases.ubuntu.com/ubuntu # mirror_gutsy = http://old-releases.ubuntu.com/ubuntu
# mirror_hardy = http://old-releases.ubuntu.com/ubuntu # mirror_hardy = http://archive.ubuntu.com/ubuntu
# mirror_intrepid = http://old-releases.ubuntu.com/ubuntu # mirror_intrepid = http://old-releases.ubuntu.com/ubuntu
# mirror_jaunty = http://old-releases.ubuntu.com/ubuntu # mirror_jaunty = http://old-releases.ubuntu.com/ubuntu
# mirror_karmic = http://old-releases.ubuntu.com/ubuntu # mirror_karmic = http://old-releases.ubuntu.com/ubuntu
@@ -291,7 +291,6 @@ mirror = `xt-guess-suite-and-mirror --mirror`
# mirror_precise = http://archive.ubuntu.com/ubuntu # mirror_precise = http://archive.ubuntu.com/ubuntu
# mirror_quantal = http://archive.ubuntu.com/ubuntu # mirror_quantal = http://archive.ubuntu.com/ubuntu
# mirror_raring = http://archive.ubuntu.com/ubuntu # mirror_raring = http://archive.ubuntu.com/ubuntu
# mirror_saucy = http://archive.ubuntu.com/ubuntu
# If this is defined it will be used by debootstrap, and configured as the # If this is defined it will be used by debootstrap, and configured as the
# proxy for the guest # proxy for the guest

View File

@@ -3,7 +3,7 @@
# This script sets up the kernel and fstab for CentOS 5. # This script sets up the kernel and fstab for CentOS 5.
# #
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -21,16 +21,16 @@ fi
logMessage Script $0 starting logMessage Script $0 starting
# Make the console work # Make the console work
sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${prefix}/etc/inittab sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/etc/inittab
sed -i "s/^1:2345/#1:2345/" ${prefix}/etc/inittab sed -i "s/^1:2345/#1:2345/" ${TARGET}/etc/inittab
# MAKEDEV is needed at this point # MAKEDEV is needed at this point
chroot ${prefix} ln -s /sbin/MAKEDEV /dev/MAKEDEV chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV
chroot ${prefix} /sbin/MAKEDEV sda sdb sdc sdd chroot ${TARGET} /sbin/MAKEDEV sda sdb sdc sdd
# Create fstab # Create fstab
logMessage Create /etc/fstab logMessage Create /etc/fstab
cat > ${prefix}/etc/fstab << EOF cat > ${TARGET}/etc/fstab << EOF
# /etc/fstab: static file system information. # /etc/fstab: static file system information.
# #
# <file system> <mount point> <type> <options> <dump> <pass> # <file system> <mount point> <type> <options> <dump> <pass>
@@ -39,26 +39,26 @@ none /dev/pts devpts mode=0620 0 0
EOF EOF
for i in `seq 1 $NUMPARTITIONS`; do for i in `seq 1 $NUMPARTITIONS`; do
echo -n "/dev/xvde$i " >> ${prefix}/etc/fstab echo -n "/dev/xvde$i " >> ${TARGET}/etc/fstab
eval part=\$PARTITION$i eval part=\$PARTITION$i
if [ ! -z "`echo $part | grep swap`" ]; then if [ ! -z "`echo $part | grep swap`" ]; then
echo "none swap ws 0 0" >> ${prefix}/etc/fstab echo "none swap ws 0 0" >> ${TARGET}/etc/fstab
else else
echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${TARGET}/etc/fstab
fi fi
done done
# Install the kernel, grub and perl # Install the kernel, grub and perl
chroot ${prefix} yum clean expire-cache chroot ${TARGET} yum clean expire-cache
chroot ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64 chroot ${TARGET} yum -y install kernel-xen grub.x86_64 perl.x86_64
KERNELVERSION=`ls ${prefix}/boot/vmlinuz-* | sed "s#$prefix/boot/vmlinuz-##"` KERNELVERSION=`ls ${TARGET}/boot/vmlinuz-* | sed "s#${TARGET}/boot/vmlinuz-##"`
logMessage "Kernel $KERNELVERSION found" logMessage "Kernel $KERNELVERSION found"
# Create grub's menu.list # Create grub's menu.list
logMessage "Creating /boot/grub/menu.lst" logMessage "Creating /boot/grub/menu.lst"
mkdir -p ${prefix}/boot/grub mkdir -p ${TARGET}/boot/grub
cat > ${prefix}/boot/grub/menu.lst << EOF cat > ${TARGET}/boot/grub/menu.lst << EOF
# WARNING : Don't forget to update this when you upgrade kernel ! # WARNING : Don't forget to update this when you upgrade kernel !
# You can also exclude kernel-xen from updates by putting # You can also exclude kernel-xen from updates by putting
# exclude=kernel-xen in in [main] in yum.conf # exclude=kernel-xen in in [main] in yum.conf

View File

@@ -3,7 +3,7 @@
# This script sets up the kernel and fstab for CentOS 5. # This script sets up the kernel and fstab for CentOS 5.
# #
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -21,16 +21,16 @@ fi
logMessage Script $0 starting logMessage Script $0 starting
# Make the console work # Make the console work
sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${prefix}/etc/inittab sed -i "/Cancelled/ {G;s/$/co:2345:respawn:\/sbin\/mingetty console/;}" ${TARGET}/etc/inittab
sed -i "s/^1:2345/#1:2345/" ${prefix}/etc/inittab sed -i "s/^1:2345/#1:2345/" ${TARGET}/etc/inittab
# MAKEDEV is needed at this point # MAKEDEV is needed at this point
chroot ${prefix} ln -s /sbin/MAKEDEV /dev/MAKEDEV chroot ${TARGET} ln -s /sbin/MAKEDEV /dev/MAKEDEV
chroot ${prefix} /sbin/MAKEDEV sda sdb sdc sdd chroot ${TARGET} /sbin/MAKEDEV sda sdb sdc sdd
# Create fstab # Create fstab
logMessage Create /etc/fstab logMessage Create /etc/fstab
cat > ${prefix}/etc/fstab << EOF cat > ${TARGET}/etc/fstab << EOF
# /etc/fstab: static file system information. # /etc/fstab: static file system information.
# #
# <file system> <mount point> <type> <options> <dump> <pass> # <file system> <mount point> <type> <options> <dump> <pass>
@@ -39,26 +39,26 @@ none /dev/pts devpts mode=0620 0 0
EOF EOF
for i in `seq 1 $NUMPARTITIONS`; do for i in `seq 1 $NUMPARTITIONS`; do
echo -n "/dev/sda$i " >> ${prefix}/etc/fstab echo -n "/dev/sda$i " >> ${TARGET}/etc/fstab
eval part=\$PARTITION$i eval part=\$PARTITION$i
if [ ! -z "`echo $part | grep swap`" ]; then if [ ! -z "`echo $part | grep swap`" ]; then
echo "none swap ws 0 0" >> ${prefix}/etc/fstab echo "none swap ws 0 0" >> ${TARGET}/etc/fstab
else else
echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${prefix}/etc/fstab echo $part | awk -F: '{print $4,$3,$5,0,1}' >> ${TARGET}/etc/fstab
fi fi
done done
# Install the kernel, grub and perl # Install the kernel, grub and perl
chroot ${prefix} yum clean expire-cache chroot ${TARGET} yum clean expire-cache
chroot ${prefix} yum -y install kernel-xen grub.x86_64 perl.x86_64 chroot ${TARGET} yum -y install kernel-xen grub.x86_64 perl.x86_64
KERNELVERSION=`ls ${prefix}/boot/vmlinuz-* | sed "s#$prefix/boot/vmlinuz-##"` KERNELVERSION=`ls ${TARGET}/boot/vmlinuz-* | sed "s#${TARGET}/boot/vmlinuz-##"`
logMessage "Kernel $KERNELVERSION found" logMessage "Kernel $KERNELVERSION found"
# Create grub's menu.list # Create grub's menu.list
logMessage "Creating /boot/grub/menu.lst" logMessage "Creating /boot/grub/menu.lst"
mkdir -p ${prefix}/boot/grub mkdir -p ${TARGET}/boot/grub
cat > ${prefix}/boot/grub/menu.lst << EOF cat > ${TARGET}/boot/grub/menu.lst << EOF
# WARNING : Don't forget to update this when you upgrade kernel ! # WARNING : Don't forget to update this when you upgrade kernel !
# You can also exclude kernel-xen from updates by putting # You can also exclude kernel-xen from updates by putting
# exclude=kernel-xen in in [main] in yum.conf # exclude=kernel-xen in in [main] in yum.conf
@@ -71,10 +71,10 @@ initrd /boot/initramfs-$KERNELVERSION.img
EOF EOF
# Some use lvm but mkinitrd will generate a wrong initrd when these are present. # Some use lvm but mkinitrd will generate a wrong initrd when these are present.
rm -f ${prefix}/etc/lvm/backup/* ${prefix}/etc/lvm/archive/* rm -f ${TARGET}/etc/lvm/backup/* ${TARGET}/etc/lvm/archive/*
# Generate a correct initrd. # Generate a correct initrd.
chroot ${prefix} mkinitrd --with=xenblk --with=xennet --preload=xenblk --preload=xennet\ chroot ${TARGET} mkinitrd --with=xenblk --with=xennet --preload=xenblk --preload=xennet\
-f /boot/initramfs-$KERNELVERSION.img $KERNELVERSION -f /boot/initramfs-$KERNELVERSION.img $KERNELVERSION
# #

View File

@@ -64,51 +64,51 @@ assert ()
# #
installDebianPackage () installDebianPackage ()
{ {
prefix=$1 TARGET=$1
shift shift
# #
# Log our options # Log our options
# #
logMessage "Installing Debian packages $@ to prefix ${prefix}" logMessage "Installing Debian packages $@ to target ${TARGET}"
# #
# We require a package + prefix # We require a package + target
# #
assert "$LINENO" "${prefix}" assert "$LINENO" "${TARGET}"
# #
# Prefix must be a directory. # Target must be a directory.
# #
assert "$LINENO" -d ${prefix} assert "$LINENO" -d ${TARGET}
# #
# Use policy-rc to stop any daemons from starting. # Use policy-rc to stop any daemons from starting.
# #
printf '#!/bin/sh\nexit 101\n' > ${prefix}/usr/sbin/policy-rc.d printf '#!/bin/sh\nexit 101\n' > ${TARGET}/usr/sbin/policy-rc.d
chmod +x ${prefix}/usr/sbin/policy-rc.d chmod +x ${TARGET}/usr/sbin/policy-rc.d
# #
# Disable the start-stop-daemon - this shouldn't be necessary # Disable the start-stop-daemon - this shouldn't be necessary
# with the policy-rc.d addition above, however leaving it in # with the policy-rc.d addition above, however leaving it in
# place won't hurt .. # place won't hurt ..
# #
disableStartStopDaemon ${prefix} disableStartStopDaemon ${TARGET}
# #
# Install the packages # Install the packages
# #
DEBIAN_FRONTEND=noninteractive chroot ${prefix} /usr/bin/apt-get --yes --force-yes --no-install-recommends install "$@" DEBIAN_FRONTEND=noninteractive chroot ${TARGET} /usr/bin/apt-get --yes --force-yes --no-install-recommends install "$@"
# #
# Remove the policy-rc.d script. # Remove the policy-rc.d script.
# #
rm -f ${prefix}/usr/sbin/policy-rc.d rm -f ${TARGET}/usr/sbin/policy-rc.d
# #
# Re-enable the start-stop-daemon # Re-enable the start-stop-daemon
# #
enableStartStopDaemon ${prefix} enableStartStopDaemon ${TARGET}
} }
@@ -118,7 +118,7 @@ installDebianPackage ()
# #
generateDebianGrubMenuLst () generateDebianGrubMenuLst ()
{ {
prefix="$1" TARGET="$1"
DOMU_ISSUE="$2" DOMU_ISSUE="$2"
DOMU_KERNEL="$3" DOMU_KERNEL="$3"
DOMU_RAMDISK="$4" DOMU_RAMDISK="$4"
@@ -126,27 +126,27 @@ generateDebianGrubMenuLst ()
# #
# Log our options # Log our options
# #
logMessage "Generating a legacy GRUB menu.lst into prefix ${prefix}" logMessage "Generating a legacy GRUB menu.lst into target ${TARGET}"
# #
# We require at least 3 parameters # We require at least 3 parameters
# #
assert "$LINENO" "${prefix}" assert "$LINENO" "${TARGET}"
assert "$LINENO" "${DOMU_ISSUE}" assert "$LINENO" "${DOMU_ISSUE}"
assert "$LINENO" "${DOMU_KERNEL}" assert "$LINENO" "${DOMU_KERNEL}"
# #
# Prefix must be a directory, kernel a file # Target must be a directory, kernel a file
# #
assert "$LINENO" -d ${prefix} assert "$LINENO" -d ${TARGET}
assert "$LINENO" -f "${prefix}/boot/${DOMU_KERNEL}" assert "$LINENO" -f "${TARGET}/boot/${DOMU_KERNEL}"
# #
# Generate a menu.lst for pygrub # Generate a menu.lst for pygrub
# #
mkdir -p ${prefix}/boot/grub mkdir -p ${TARGET}/boot/grub
cat << E_O_MENU > ${prefix}/boot/grub/menu.lst cat << E_O_MENU > ${TARGET}/boot/grub/menu.lst
default 0 default 0
timeout 2 timeout 2
@@ -256,10 +256,10 @@ E_O_MENU
# #
disableStartStopDaemon () disableStartStopDaemon ()
{ {
local prefix="$1" local TARGET="$1"
assert "$LINENO" "${prefix}" assert "$LINENO" "${TARGET}"
for starter in start-stop-daemon initctl; do for starter in start-stop-daemon initctl; do
local daemonfile="${prefix}/sbin/${starter}" local daemonfile="${TARGET}/sbin/${starter}"
mv "${daemonfile}" "${daemonfile}.REAL" mv "${daemonfile}" "${daemonfile}.REAL"
echo '#!/bin/sh' > "${daemonfile}" echo '#!/bin/sh' > "${daemonfile}"
@@ -277,10 +277,10 @@ disableStartStopDaemon ()
# #
enableStartStopDaemon () enableStartStopDaemon ()
{ {
local prefix=$1 local TARGET=$1
assert "$LINENO" "${prefix}" assert "$LINENO" "${TARGET}"
for starter in start-stop-daemon initctl; do for starter in start-stop-daemon initctl; do
local daemonfile="${prefix}/sbin/${starter}" local daemonfile="${TARGET}/sbin/${starter}"
# #
# If the disabled file is present then enable it. # If the disabled file is present then enable it.
@@ -301,28 +301,28 @@ enableStartStopDaemon ()
# #
removeDebianPackage () removeDebianPackage ()
{ {
prefix=$1 TARGET=$1
shift shift
# #
# Log our options # Log our options
# #
logMessage "Purging Debian package ${package} from prefix ${prefix}" logMessage "Purging Debian package ${package} from target ${TARGET}"
# #
# We require a prefix # We require a target
# #
assert "$LINENO" "${prefix}" assert "$LINENO" "${TARGET}"
# #
# Prefix must be a directory. # Target must be a directory.
# #
assert "$LINENO" -d ${prefix} assert "$LINENO" -d ${TARGET}
# #
# Purge the packages we've been given. # Purge the packages we've been given.
# #
chroot ${prefix} /usr/bin/apt-get remove --yes --purge "$@" chroot ${TARGET} /usr/bin/apt-get remove --yes --purge "$@"
} }
@@ -332,29 +332,29 @@ removeDebianPackage ()
# #
installRPMPackage () installRPMPackage ()
{ {
prefix=$1 TARGET=$1
package=$2 package=$2
# #
# Log our options # Log our options
# #
logMessage "Installing RPM ${package} to prefix ${prefix}" logMessage "Installing RPM ${package} to target ${TARGET}"
# #
# We require a package + prefix # We require a package + target
# #
assert "$LINENO" "${package}" assert "$LINENO" "${package}"
assert "$LINENO" "${prefix}" assert "$LINENO" "${TARGET}"
# #
# Prefix must be a directory. # Target must be a directory.
# #
assert "$LINENO" -d ${prefix} assert "$LINENO" -d ${TARGET}
# #
# Install the package # Install the package
# #
chroot ${prefix} /usr/bin/yum -y install ${package} chroot ${TARGET} /usr/bin/yum -y install ${package}
} }
# Backwards Compatibility Function # Backwards Compatibility Function
@@ -373,7 +373,7 @@ isYum() ( [ -x $1/usr/bin/yum ] )
# #
installPackage () installPackage ()
{ {
prefix=$1 TARGET=$1
package=$2 package=$2
if isDeb ; then if isDeb ; then
@@ -396,13 +396,13 @@ installPackage ()
# #
installGentooPackage () installGentooPackage ()
{ {
prefix=$1 TARGET=$1
package=$2 package=$2
# #
# Log our options # Log our options
# #
logMessage "Installing Gentoo package ${package} to prefix ${prefix}" logMessage "Installing Gentoo package ${package} to target ${TARGET}"
logMessage "NOTE: Not doing anything - this is a stub - FIXME" logMessage "NOTE: Not doing anything - this is a stub - FIXME"

View File

@@ -8,7 +8,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -30,20 +30,20 @@ logMessage Script $0 starting
# #
# Make sure we have a directory. # Make sure we have a directory.
# #
if [ ! -d "${prefix}/usr/sbin" ]; then if [ ! -d "${TARGET}/usr/sbin" ]; then
mkdir -p "${prefix}/usr/sbin" mkdir -p "${TARGET}/usr/sbin"
logMessage "created missing directory: ${prefix}/usr/sbin" logMessage "created missing directory: ${TARGET}/usr/sbin"
fi fi
# #
# Add the script. # Add the script.
# #
echo '#!/bin/sh' > ${prefix}/usr/sbin/policy-rc.d echo '#!/bin/sh' > ${TARGET}/usr/sbin/policy-rc.d
echo 'exit 101' >> ${prefix}/usr/sbin/policy-rc.d echo 'exit 101' >> ${TARGET}/usr/sbin/policy-rc.d
chmod 755 ${prefix}/usr/sbin/policy-rc.d chmod 755 ${TARGET}/usr/sbin/policy-rc.d

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -29,9 +29,9 @@ logMessage Script $0 starting
# #
# Enable the shadow passwords if the command is found. # Enable the shadow passwords if the command is found.
# #
if [ -x ${prefix}/sbin/shadowconfig ]; then if [ -x ${TARGET}/sbin/shadowconfig ]; then
chroot ${prefix} /sbin/shadowconfig on chroot ${TARGET} /sbin/shadowconfig on
else else
logMessage "/sbin/shadowconfig not found. skipping." logMessage "/sbin/shadowconfig not found. skipping."

View File

@@ -8,7 +8,7 @@
prefix=$1 TARGET=$1
# #
@@ -37,8 +37,8 @@ if [ "`uname -m`" = "x86_64" ]; then
else else
logMessage "Disabling TLS" logMessage "Disabling TLS"
mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled
mkdir ${prefix}/lib/tls mkdir ${TARGET}/lib/tls
fi fi

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
# #
# Disable the startup scripts from all runlevels. # Disable the startup scripts from all runlevels.
# #
chroot ${prefix} /usr/sbin/update-rc.d -f hwclock.sh remove chroot ${TARGET} /usr/sbin/update-rc.d -f hwclock.sh remove
# #
# Log our finish # Log our finish

View File

@@ -8,7 +8,7 @@
# #
prefix=$1 TARGET=$1
# #
@@ -33,17 +33,17 @@ logMessage Script $0 starting
# the setting to the proxy guess file. # the setting to the proxy guess file.
# #
if [ ${apt_proxy} ]; then if [ ${apt_proxy} ]; then
echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${TARGET}/etc/apt/apt.conf.d/01proxy
else else
logMessage The use of a proxy detected. logMessage The use of a proxy detected.
apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy apt-config dump | grep -i Acquire::HTTP::Proxy > ${TARGET}/etc/apt/apt.conf.d/01proxy
fi fi
# #
# Setup the sources.list file for new installations of Ubuntu GNU/Linux. # Setup the sources.list file for new installations of Ubuntu GNU/Linux.
# #
cat <<E_O_APT > ${prefix}/etc/apt/sources.list cat <<E_O_APT > ${TARGET}/etc/apt/sources.list
# #
# /etc/apt/sources.list # /etc/apt/sources.list
# #
@@ -66,7 +66,7 @@ E_O_APT
# #
# Now that the sources have been setup make sure the system is up to date. # Now that the sources have been setup make sure the system is up to date.
# #
chroot ${prefix} /usr/bin/apt-get update chroot ${TARGET} /usr/bin/apt-get update
# #
@@ -76,7 +76,7 @@ chroot ${prefix} /usr/bin/apt-get update
if [ "$arch" = 'i386' -a "$dist" != 'dapper' ]; then if [ "$arch" = 'i386' -a "$dist" != 'dapper' ]; then
logMessage "Installing libc6-xen" logMessage "Installing libc6-xen"
installDebianPackage ${prefix} libc6-xen installDebianPackage ${TARGET} libc6-xen
fi fi

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -29,12 +29,12 @@ logMessage Script $0 starting
# #
# Update yum # Update yum
# #
if [ ! -d ${prefix}/proc ]; then if [ ! -d ${TARGET}/proc ]; then
mkdir -p ${prefix}/proc mkdir -p ${TARGET}/proc
fi fi
mount -o bind /proc ${prefix}/proc mount -o bind /proc ${TARGET}/proc
chroot ${prefix} /usr/bin/yum update chroot ${TARGET} /usr/bin/yum update
umount ${prefix}/proc umount ${TARGET}/proc
# #

View File

@@ -7,7 +7,7 @@
prefix=$1 TARGET=$1
# #
@@ -31,7 +31,7 @@ logMessage Script $0 starting
# #
# NOTE: Failure to support your favourite language is *not* a bug. # NOTE: Failure to support your favourite language is *not* a bug.
# #
installDebianPackage ${prefix} language-pack-en installDebianPackage ${TARGET} language-pack-en
# #

View File

@@ -6,7 +6,7 @@
# #
prefix=$1 TARGET=$1
# #
@@ -30,20 +30,20 @@ logMessage Script $0 starting
# #
# Upstart on Ubuntu newer than 8.04 # Upstart on Ubuntu newer than 8.04
rm -f ${prefix}/etc/init/tty[!1].conf rm -f ${TARGET}/etc/init/tty[!1].conf
[ -f ${prefix}/etc/init/tty1.conf ] && { [ -f ${TARGET}/etc/init/tty1.conf ] && {
sed -i -e s/tty1/hvc0/ ${prefix}/etc/init/tty1.conf sed -i -e s/tty1/hvc0/ ${TARGET}/etc/init/tty1.conf
mv ${prefix}/etc/init/tty1.conf ${prefix}/etc/init/hvc0.conf mv ${TARGET}/etc/init/tty1.conf ${TARGET}/etc/init/hvc0.conf
} }
# Upstart on Ubuntu 8.04 or older # Upstart on Ubuntu 8.04 or older
rm -f ${prefix}/etc/event.d/tty[!1] rm -f ${TARGET}/etc/event.d/tty[!1]
[ -f ${prefix}/etc/event.d/tty1 ] && { [ -f ${TARGET}/etc/event.d/tty1 ] && {
sed -i -e s/tty1/hvc0/ ${prefix}/etc/event.d/tty1 sed -i -e s/tty1/hvc0/ ${TARGET}/etc/event.d/tty1
mv ${prefix}/etc/event.d/tty1 ${prefix}/etc/event.d/hvc0 mv ${TARGET}/etc/event.d/tty1 ${TARGET}/etc/event.d/hvc0
} }
# Inittab # Inittab
[ -f ${prefix}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${prefix}/etc/inittab [ -f ${TARGET}/etc/inittab ] && sed -i -e 's/^\([2-6].*:respawn*\)/#\1/' -e 's/^T/#\t/' -e 's/tty1$/hvc0/' ${TARGET}/etc/inittab
# #
@@ -59,21 +59,21 @@ if [ ! -z "${serial_device}" ]; then
# replace existing device. # replace existing device.
# Upstart on Ubuntu newer than 8.04 # Upstart on Ubuntu newer than 8.04
[ -f ${prefix}/etc/init/hvc0.conf ] && { [ -f ${TARGET}/etc/init/hvc0.conf ] && {
mv ${prefix}/etc/init/hvc0.conf ${prefix}/etc/init/${serial_device}.conf mv ${TARGET}/etc/init/hvc0.conf ${TARGET}/etc/init/${serial_device}.conf
sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/init/${serial_device}.conf sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/init/${serial_device}.conf
} }
# Upstart on Ubuntu 8.04 or older # Upstart on Ubuntu 8.04 or older
[ -f ${prefix}/etc/event.d/hvc0 ] && { [ -f ${TARGET}/etc/event.d/hvc0 ] && {
mv ${prefix}/etc/event.d/hvc0 ${prefix}/etc/event.d/${serial_device} mv ${TARGET}/etc/event.d/hvc0 ${TARGET}/etc/event.d/${serial_device}
sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/event.d/${serial_device} sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/event.d/${serial_device}
} }
# Inittab # Inittab
[ -f ${prefix}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${prefix}/etc/inittab [ -f ${TARGET}/etc/inittab ] && sed -i -e s/hvc0/${serial_device}/ ${TARGET}/etc/inittab
# make sure that it is allowed to login. # make sure that it is allowed to login.
echo $serial_device >> ${prefix}/etc/securetty echo $serial_device >> ${TARGET}/etc/securetty
fi fi

View File

@@ -8,7 +8,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -29,7 +29,7 @@ logMessage Script $0 starting
# #
# Make sure we have an /etc/network directory. # Make sure we have an /etc/network directory.
# #
mkdir -p ${prefix}/etc/network mkdir -p ${TARGET}/etc/network
# #
@@ -40,7 +40,7 @@ setupDynamicNetworking ()
# #
# The host is using DHCP. # The host is using DHCP.
# #
cat <<E_O_DHCP > ${prefix}/etc/network/interfaces cat <<E_O_DHCP > ${TARGET}/etc/network/interfaces
# This file describes the network interfaces available on your system # This file describes the network interfaces available on your system
# and how to activate them. For more information, see interfaces(5). # and how to activate them. For more information, see interfaces(5).
@@ -88,7 +88,7 @@ setupStaticNetworking ()
# #
# We have a static IP address # We have a static IP address
# #
cat <<E_O_STATIC >${prefix}/etc/network/interfaces cat <<E_O_STATIC >${TARGET}/etc/network/interfaces
# This file describes the network interfaces available on your system # This file describes the network interfaces available on your system
# and how to activate them. For more information, see interfaces(5). # and how to activate them. For more information, see interfaces(5).
@@ -122,7 +122,7 @@ E_O_STATIC
logMessage Adding etho:${interface} logMessage Adding etho:${interface}
cat <<E_O_STATIC >>${prefix}/etc/network/interfaces cat <<E_O_STATIC >>${TARGET}/etc/network/interfaces
auto eth0:${interface} auto eth0:${interface}
iface eth0:${interface} inet static iface eth0:${interface} inet static
address ${value} address ${value}
@@ -139,12 +139,12 @@ E_O_STATIC
# will be restored after hooks are run. # will be restored after hooks are run.
# #
if [ '' != "$nameserver" ]; then if [ '' != "$nameserver" ]; then
rm -f ${prefix}/etc/resolv.conf.old rm -f ${TARGET}/etc/resolv.conf.old
for ns in $nameserver; do for ns in $nameserver; do
echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
done done
else else
cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
fi fi
} }

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
# #
# Make sure we have an /etc/sysconfig/network-scripts directory. # Make sure we have an /etc/sysconfig/network-scripts directory.
# #
mkdir -p ${prefix}/etc/sysconfig/network-scripts/ mkdir -p ${TARGET}/etc/sysconfig/network-scripts/
# #
@@ -40,7 +40,7 @@ if [ -z "${dhcp}" ]; then
# #
# Setup the initial interface # Setup the initial interface
# #
cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0 cat <<E_O_STATIC >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0
DEVICE=eth0 DEVICE=eth0
ONBOOT=yes ONBOOT=yes
BOOTPROTO=static BOOTPROTO=static
@@ -62,7 +62,7 @@ E_O_STATIC
logMessage Adding etho:${interface} logMessage Adding etho:${interface}
cat <<E_O_STATIC >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface} cat <<E_O_STATIC >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0:${interface}
DEVICE=eth0:${interface} DEVICE=eth0:${interface}
ONBOOT=yes ONBOOT=yes
BOOTPROTO=static BOOTPROTO=static
@@ -79,27 +79,27 @@ E_O_STATIC
# will be restored after hooks are run. # will be restored after hooks are run.
# #
if [ '' != "$nameserver" ]; then if [ '' != "$nameserver" ]; then
rm -f ${prefix}/etc/resolv.conf.old rm -f ${TARGET}/etc/resolv.conf.old
for ns in $nameserver; do for ns in $nameserver; do
echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
done done
else else
cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
fi fi
else else
cat <<E_O_DHCP >${prefix}/etc/sysconfig/network-scripts/ifcfg-eth0 cat <<E_O_DHCP >${TARGET}/etc/sysconfig/network-scripts/ifcfg-eth0
DEVICE=eth0 DEVICE=eth0
BOOTPROTO=dhcp BOOTPROTO=dhcp
ONBOOT=yes ONBOOT=yes
E_O_DHCP E_O_DHCP
chroot ${prefix} /usr/bin/yum -y install dhclient chroot ${TARGET} /usr/bin/yum -y install dhclient
fi fi
# #
# Don't forget to setup the default route. # Don't forget to setup the default route.
# #
cat <<EOF >${prefix}/etc/sysconfig/network cat <<EOF >${TARGET}/etc/sysconfig/network
NETWORKING=yes NETWORKING=yes
GATEWAY=${gateway} GATEWAY=${gateway}
HOSTNAME=${hostname} HOSTNAME=${hostname}

View File

@@ -9,7 +9,7 @@
prefix=$1 TARGET=$1
# #
@@ -43,8 +43,8 @@ umask 022
# #
# Setup the mailname + hostname files. # Setup the mailname + hostname files.
# #
echo $GUEST_HOSTNAME > ${prefix}/etc/hostname echo $GUEST_HOSTNAME > ${TARGET}/etc/hostname
echo $GUEST_FQDN > ${prefix}/etc/mailname echo $GUEST_FQDN > ${TARGET}/etc/mailname
# #
@@ -55,7 +55,7 @@ if [ -z "${copyhosts}" ]; then
# #
# Copy localhost # Copy localhost
# #
cat > ${prefix}/etc/hosts <<EOF cat > ${TARGET}/etc/hosts <<EOF
127.0.0.1 localhost 127.0.0.1 localhost
EOF EOF
# #
@@ -65,21 +65,21 @@ EOF
# #
# If dhcp is diabled, FQDN should resolve to our IP # If dhcp is diabled, FQDN should resolve to our IP
# #
cat >> ${prefix}/etc/hosts <<EOF cat >> ${TARGET}/etc/hosts <<EOF
${ip1} $GUEST_FQDN $GUEST_HOSTNAME ${ip1} $GUEST_FQDN $GUEST_HOSTNAME
EOF EOF
else else
cat >> ${prefix}/etc/hosts <<EOF cat >> ${TARGET}/etc/hosts <<EOF
127.0.1.1 $GUEST_FQDN $GUEST_HOSTNAME 127.0.1.1 $GUEST_FQDN $GUEST_HOSTNAME
EOF EOF
fi fi
cat >> ${prefix}/etc/hosts <<EOF cat >> ${TARGET}/etc/hosts <<EOF
# The following lines are desirable for IPv6 capable hosts # The following lines are desirable for IPv6 capable hosts
::1 ip6-localhost ip6-loopback ::1 ip6-localhost ip6-loopback
fe00::0 ip6-localnet fe00::0 ip6-localnet
ff00::0 ip6-mcastprefix ff00::0 ip6-mcastTARGET
ff02::1 ip6-allnodes ff02::1 ip6-allnodes
ff02::2 ip6-allrouters ff02::2 ip6-allrouters
ff02::3 ip6-allhosts ff02::3 ip6-allhosts
@@ -88,23 +88,23 @@ EOF
else else
# Non-IPv6 stuff. # Non-IPv6 stuff.
grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
# New entry. # New entry.
if [ -z "${dhcp}" ]; then if [ -z "${dhcp}" ]; then
cat >> ${prefix}/etc/hosts <<EOF cat >> ${TARGET}/etc/hosts <<EOF
${ip1} $GUEST_FQDN $GUEST_HOSTNAME ${ip1} $GUEST_FQDN $GUEST_HOSTNAME
EOF EOF
else else
cat >> ${prefix}/etc/hosts <<EOF cat >> ${TARGET}/etc/hosts <<EOF
127.0.1.1 $GUEST_FQDN $GUEST_HOSTNAME 127.0.1.1 $GUEST_FQDN $GUEST_HOSTNAME
EOF EOF
fi fi
# IPv6 stuff. # IPv6 stuff.
grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
fi fi

View File

@@ -9,7 +9,7 @@
prefix=$1 TARGET=$1
# #
@@ -37,8 +37,8 @@ umask 022
# #
# Setup the mailname + hostname files. # Setup the mailname + hostname files.
# #
echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${prefix}/etc/hostname echo ${hostname} | sed 's/^\([^\.]*\)\..*/\1/' > ${TARGET}/etc/hostname
echo ${hostname} > ${prefix}/etc/mailname echo ${hostname} > ${TARGET}/etc/mailname
# #
@@ -48,21 +48,21 @@ echo ${hostname} > ${prefix}/etc/mailname
if [ -z "${dhcp}" ]; then if [ -z "${dhcp}" ]; then
# Non-IPv6 stuff. # Non-IPv6 stuff.
grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
# New entry. # New entry.
echo "${ip1} ${hostname}" >> ${prefix}/etc/hosts echo "${ip1} ${hostname}" >> ${TARGET}/etc/hosts
echo " " >> ${prefix}/etc/hosts echo " " >> ${TARGET}/etc/hosts
# IPv6 stuff. # IPv6 stuff.
grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
else else
# #
# Stub /etc/hosts for DHCP clients. # Stub /etc/hosts for DHCP clients.
# #
cat >> ${prefix}/etc/hosts <<EOF cat >> ${TARGET}/etc/hosts <<EOF
127.0.0.1 localhost 127.0.0.1 localhost
# The following lines are desirable for IPv6 capable hosts # The following lines are desirable for IPv6 capable hosts

View File

@@ -8,7 +8,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -32,8 +32,8 @@ logMessage Script $0 starting
MAKEDEV='' MAKEDEV=''
MAKEDEV_PATHS="/sbin/MAKEDEV /dev/MAKEDEV" MAKEDEV_PATHS="/sbin/MAKEDEV /dev/MAKEDEV"
for MAKEDEV_PATH in ${MAKEDEV_PATHS}; do for MAKEDEV_PATH in ${MAKEDEV_PATHS}; do
if [ -x "${prefix}${MAKEDEV_PATH}" ]; then if [ -x "${TARGET}${MAKEDEV_PATH}" ]; then
MAKEDEV="${prefix}${MAKEDEV_PATH}" MAKEDEV="${TARGET}${MAKEDEV_PATH}"
break break
fi fi
done done
@@ -44,11 +44,11 @@ if [ -n "${MAKEDEV}" ]; then
# Early termination if we have a couple of common devices present # Early termination if we have a couple of common devices present
# should speed up installs which use --copy/--tar # should speed up installs which use --copy/--tar
# #
if ( test `ls -1 ${prefix}/dev | wc -l` -gt 10 ); then if ( test `ls -1 ${TARGET}/dev | wc -l` -gt 10 ); then
# #
# We still need to make sure the basic devices are present # We still need to make sure the basic devices are present
# #
cd ${prefix}/dev cd ${TARGET}/dev
${MAKEDEV} std ${MAKEDEV} std
${MAKEDEV} hda ${MAKEDEV} hda
${MAKEDEV} sda ${MAKEDEV} sda
@@ -62,7 +62,7 @@ fi
# #
# Make the device nodes. # Make the device nodes.
# #
cd ${prefix}/dev cd ${TARGET}/dev
${MAKEDEV} generic ${MAKEDEV} generic
${MAKEDEV} std ${MAKEDEV} std

View File

@@ -5,7 +5,7 @@
# #
prefix=$1 TARGET=$1
# #
@@ -27,8 +27,8 @@ logMessage Script $0 starting
# #
# Copy "required" files from our host. # Copy "required" files from our host.
# #
cp /etc/timezone ${prefix}/etc cp /etc/timezone ${TARGET}/etc
cp /etc/localtime ${prefix}/etc cp /etc/localtime ${TARGET}/etc
# #

View File

@@ -5,7 +5,7 @@
# #
prefix=$1 TARGET=$1
# #
@@ -32,7 +32,7 @@ if [ -d /etc/xen-tools/skel ]; then
logMessage Copying files from /etc/xen-tools/skel logMessage Copying files from /etc/xen-tools/skel
(cd /etc/xen-tools/skel; tar -cf - . ) | (cd ${prefix}/; tar -xpf -) (cd /etc/xen-tools/skel; tar -cf - . ) | (cd ${TARGET}/; tar -xpf -)
logMessage Finished logMessage Finished

View File

@@ -10,7 +10,7 @@
# -- # --
# http://nedos.net/ # http://nedos.net/
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -31,13 +31,13 @@ logMessage Script $0 starting
# #
# First, create an ssh directory # First, create an ssh directory
# #
mkdir -p ${prefix}/etc/ssh mkdir -p ${TARGET}/etc/ssh
# #
# Second, Generate the Host RSA Key # Second, Generate the Host RSA Key
# #
if [ ! -f ${prefix}/etc/ssh/ssh_host_rsa_key ]; then if [ ! -f ${TARGET}/etc/ssh/ssh_host_rsa_key ]; then
if ssh-keygen -t rsa -N "" -f ${prefix}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then if ssh-keygen -t rsa -N "" -f ${TARGET}/etc/ssh/ssh_host_rsa_key -C "root@${hostname}"; then
logMessage "successfully generated RSA host key" logMessage "successfully generated RSA host key"
else else
logMessage "failed to generate RSA host key" logMessage "failed to generate RSA host key"
@@ -47,8 +47,8 @@ fi
# #
# Third, Generate the Host DSA Key # Third, Generate the Host DSA Key
# #
if [ ! -f ${prefix}/etc/ssh/ssh_host_dsa_key ]; then if [ ! -f ${TARGET}/etc/ssh/ssh_host_dsa_key ]; then
if ssh-keygen -t dsa -N "" -f ${prefix}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then if ssh-keygen -t dsa -N "" -f ${TARGET}/etc/ssh/ssh_host_dsa_key -C "root@${hostname}"; then
logMessage "successfully generated DSA host key" logMessage "successfully generated DSA host key"
else else
logMessage "failed to generate DSA host key" logMessage "failed to generate DSA host key"
@@ -58,7 +58,7 @@ fi
# #
# Install ssh # Install ssh
# #
installDebianPackage ${prefix} openssh-server installDebianPackage ${TARGET} openssh-server
# #
# Log our finish # Log our finish

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -28,12 +28,12 @@ logMessage Script $0 starting
# #
# Install the OpenSSH server. # Install the OpenSSH server.
# #
if [ ! -d ${prefix}/proc ]; then if [ ! -d ${TARGET}/proc ]; then
mkdir -p ${prefix}/proc mkdir -p ${TARGET}/proc
fi fi
mount -o bind /proc ${prefix}/proc mount -o bind /proc ${TARGET}/proc
chroot ${prefix} /usr/bin/yum -y install openssh-server passwd chroot ${TARGET} /usr/bin/yum -y install openssh-server passwd
umount ${prefix}/proc umount ${TARGET}/proc
# #

View File

@@ -8,7 +8,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
# #
# If the file doesn't exist exit early. # If the file doesn't exist exit early.
# #
if [ ! -e ${prefix}/etc/securetty ]; then if [ ! -e ${TARGET}/etc/securetty ]; then
logMessage /etc/securetty not found. logMessage /etc/securetty not found.
exit exit
fi fi
@@ -43,13 +43,13 @@ for i in xvc0 hvc0 ; do
# #
# Only append if not presnt. # Only append if not presnt.
# #
if ( grep $i ${prefix}/etc/securetty > /dev/null ) ; then if ( grep $i ${TARGET}/etc/securetty > /dev/null ) ; then
logMessage Host already has $i entry logMessage Host already has $i entry
else else
echo $i >> ${prefix}/etc/securetty echo $i >> ${TARGET}/etc/securetty
fi fi
done done

View File

@@ -12,7 +12,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
@@ -50,16 +50,16 @@ if [ -n "${modules}" -a -d "${modules}" ]; then
# #
logMessage "Copying modules from ${modules}" logMessage "Copying modules from ${modules}"
mkdir -p ${prefix}/lib/modules mkdir -p ${TARGET}/lib/modules
cp -au ${modules} ${prefix}/lib/modules cp -au ${modules} ${TARGET}/lib/modules
elif chroot ${prefix} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then elif chroot ${TARGET} /usr/bin/apt-cache show ${linux_modules_package} >/dev/null 2>/dev/null; then
logMessage "Package '${linux_modules_package}' is available - installing" logMessage "Package '${linux_modules_package}' is available - installing"
# #
# If it worked then we can install the package. # If it worked then we can install the package.
# #
installDebianPackage ${prefix} ${linux_modules_package} installDebianPackage ${TARGET} ${linux_modules_package}
else else
# #
@@ -69,8 +69,8 @@ else
logMessage "Package '${linux_modules_package}' is not available" logMessage "Package '${linux_modules_package}' is not available"
logMessage "Copying modules from /lib/modules/$(uname -r)" logMessage "Copying modules from /lib/modules/$(uname -r)"
mkdir -p ${prefix}/lib/modules mkdir -p ${TARGET}/lib/modules
cp -au /lib/modules/$(uname -r) ${prefix}/lib/modules cp -au /lib/modules/$(uname -r) ${TARGET}/lib/modules
fi fi
fi # if pygrub fi # if pygrub

View File

@@ -12,7 +12,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
@@ -36,8 +36,8 @@ logMessage Script $0 starting
# Copy the modules from the host to the new system - we should only # Copy the modules from the host to the new system - we should only
# really copy the *correct* modules, but we don't know what they are. # really copy the *correct* modules, but we don't know what they are.
# #
mkdir -p ${prefix}/lib/modules mkdir -p ${TARGET}/lib/modules
cp -au /lib/modules/*/ ${prefix}/lib/modules cp -au /lib/modules/*/ ${TARGET}/lib/modules
# #

View File

@@ -6,7 +6,7 @@
# can't really do anything bad; just waste a bit of space. # can't really do anything bad; just waste a bit of space.
# #
prefix=$1 TARGET=$1
@@ -28,14 +28,14 @@ logMessage Script $0 starting
# #
# Install either kmod or module-init-tools package. # Install either kmod or module-init-tools package.
# #
if chroot ${prefix} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then if chroot ${TARGET} /usr/bin/apt-cache show module-init-tools >/dev/null 2>/dev/null; then
if chroot ${prefix} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then if chroot ${TARGET} /usr/bin/apt-cache show module-init-tools | fgrep -qi transitional; then
installDebianPackage ${prefix} kmod installDebianPackage ${TARGET} kmod
else else
installDebianPackage ${prefix} module-init-tools installDebianPackage ${TARGET} module-init-tools
fi fi
else else
installDebianPackage ${prefix} kmod installDebianPackage ${TARGET} kmod
fi fi
# #

View File

@@ -7,7 +7,7 @@
# really do anything bad; just waste a bit of space. # really do anything bad; just waste a bit of space.
prefix=$1 TARGET=$1
@@ -31,16 +31,16 @@ if [ ${pygrub} ]; then
# #
# Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu) # Install the grub 0.9x package ("grub-legacy" on Debian, "grub" on Ubuntu)
# #
if chroot ${prefix} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then if chroot ${TARGET} /usr/bin/apt-cache show grub-legacy 2>/dev/null | egrep -qi 'GRand Unified Bootloader.*Legacy'; then
installDebianPackage ${prefix} grub-legacy installDebianPackage ${TARGET} grub-legacy
else else
installDebianPackage ${prefix} grub installDebianPackage ${TARGET} grub
fi fi
if [ ! -e ${prefix}/boot/grub/default ]; then if [ ! -e ${TARGET}/boot/grub/default ]; then
echo default > ${prefix}/boot/grub/default echo default > ${TARGET}/boot/grub/default
fi fi
chroot ${prefix} /usr/sbin/update-grub chroot ${TARGET} /usr/sbin/update-grub
else else
logMessage "pygrub not set, skipping grub-legacy installation" logMessage "pygrub not set, skipping grub-legacy installation"

View File

@@ -12,7 +12,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -62,7 +62,7 @@ logMessage "Root device is /dev/$device"
has_xfs=0 has_xfs=0
has_reiserfs=0 has_reiserfs=0
has_btrfs=0 has_btrfs=0
cat <<E_O_FSTAB > ${prefix}/etc/fstab cat <<E_O_FSTAB > ${TARGET}/etc/fstab
# /etc/fstab: static file system information. # /etc/fstab: static file system information.
# #
# <file system> <mount point> <type> <options> <dump> <pass> # <file system> <mount point> <type> <options> <dump> <pass>
@@ -93,9 +93,9 @@ for part in `seq 1 ${NUMPARTITIONS}`; do
esac esac
if [ "${partdata2}" = "swap" ]; then if [ "${partdata2}" = "swap" ]; then
echo "/dev/${device}${part} none swap sw 0 0" >> ${prefix}/etc/fstab echo "/dev/${device}${part} none swap sw 0 0" >> ${TARGET}/etc/fstab
else else
echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${prefix}/etc/fstab echo "/dev/${device}${part} ${partdata3} ${partdata2} ${partdata4} 0 1" >> ${TARGET}/etc/fstab
fi fi
done done
@@ -106,7 +106,7 @@ logMessage Checking for filesystem tools to install
# Install any required packages for the given root filesystem # Install any required packages for the given root filesystem
# #
if [ "$has_xfs" -eq 1 ]; then if [ "$has_xfs" -eq 1 ]; then
installPackage ${prefix} xfsprogs installPackage ${TARGET} xfsprogs
fi fi
if [ "$has_reiserfs" -eq 1 ]; then if [ "$has_reiserfs" -eq 1 ]; then
if isAPT; then if isAPT; then

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -29,7 +29,7 @@ logMessage Script $0 starting
# #
# Clean the APT package cache for Debian GNU/Linux. # Clean the APT package cache for Debian GNU/Linux.
# #
chroot ${prefix} /usr/bin/apt-get clean chroot ${TARGET} /usr/bin/apt-get clean
# #

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -29,20 +29,20 @@ logMessage Script $0 starting
# Clean up RPM files. # Clean up RPM files.
# #
logMessage Cleaning .rpm* files. logMessage Cleaning .rpm* files.
find ${prefix}/ -name '*.rpmorig' -exec rm -f \{\} \; find ${TARGET}/ -name '*.rpmorig' -exec rm -f \{\} \;
find ${prefix}/ -name '*.rpmnew' -exec rm -f \{\} \; find ${TARGET}/ -name '*.rpmnew' -exec rm -f \{\} \;
# #
# Clean yum # Clean yum
# #
logMessage Cleaning Yum Repository logMessage Cleaning Yum Repository
if [ ! -d ${prefix}/proc ]; then if [ ! -d ${TARGET}/proc ]; then
mkdir -p ${prefix}/proc mkdir -p ${TARGET}/proc
fi fi
mount -o bind /proc ${prefix}/proc mount -o bind /proc ${TARGET}/proc
chroot ${prefix} /usr/bin/yum clean all chroot ${TARGET} /usr/bin/yum clean all
umount ${prefix}/proc umount ${TARGET}/proc
# #
# Log our finish # Log our finish

View File

@@ -8,7 +8,7 @@
prefix=$1 TARGET=$1
# #
@@ -30,11 +30,11 @@ logMessage Script $0 starting
# #
# Remove the script if present. # Remove the script if present.
# #
if [ -x "${prefix}/usr/sbin/policy-rc.d" ]; then if [ -x "${TARGET}/usr/sbin/policy-rc.d" ]; then
rm -f "${prefix}/usr/sbin/policy-rc.d" rm -f "${TARGET}/usr/sbin/policy-rc.d"
logMessage "Removed: ${prefix}/usr/sbin/policy-rc.d" logMessage "Removed: ${TARGET}/usr/sbin/policy-rc.d"
fi fi

View File

@@ -8,7 +8,7 @@
# #
prefix=$1 TARGET=$1
# #
@@ -33,17 +33,17 @@ logMessage Script $0 starting
# the setting to the proxy guess file. # the setting to the proxy guess file.
# #
if [ ${apt_proxy} ]; then if [ ${apt_proxy} ]; then
echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${prefix}/etc/apt/apt.conf.d/01proxy echo "Acquire::http::Proxy \"${apt_proxy}\";" > ${TARGET}/etc/apt/apt.conf.d/01proxy
else else
logMessage The use of a proxy detected. logMessage The use of a proxy detected.
apt-config dump | grep -i Acquire::HTTP::Proxy > ${prefix}/etc/apt/apt.conf.d/01proxy apt-config dump | grep -i Acquire::HTTP::Proxy > ${TARGET}/etc/apt/apt.conf.d/01proxy
fi fi
# #
# Setup the sources.list file for new installations of Debian GNU/Linux. # Setup the sources.list file for new installations of Debian GNU/Linux.
# #
cat <<E_O_APT > ${prefix}/etc/apt/sources.list cat <<E_O_APT > ${TARGET}/etc/apt/sources.list
# #
# /etc/apt/sources.list # /etc/apt/sources.list
# #
@@ -66,7 +66,7 @@ if ( test "${dist}" "!=" "sid" && test "${dist}" "!=" "unstable" && \
test -e /etc/apt/sources.list && \ test -e /etc/apt/sources.list && \
grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then grep ^deb.*security -r /etc/apt/sources.list /etc/apt/sources.list.d >/dev/null 2>/dev/null ) ; then
cat <<E_O_APT >> ${prefix}/etc/apt/sources.list cat <<E_O_APT >> ${TARGET}/etc/apt/sources.list
# #
# Security updates # Security updates
# #
@@ -75,7 +75,7 @@ deb-src http://security.debian.org/ ${dist}/updates main contrib non-free
E_O_APT E_O_APT
else else
cat <<E_O_APT >> ${prefix}/etc/apt/sources.list cat <<E_O_APT >> ${TARGET}/etc/apt/sources.list
# #
# Security updates - Uncomment to enable. # Security updates - Uncomment to enable.
# #
@@ -88,7 +88,7 @@ fi
# #
# Now that the sources have been setup make sure the system is up to date. # Now that the sources have been setup make sure the system is up to date.
# #
chroot ${prefix} /usr/bin/apt-get update chroot ${TARGET} /usr/bin/apt-get update
# #
# For all systems after Sarge we install libc6-xen on i386 # For all systems after Sarge we install libc6-xen on i386
@@ -98,11 +98,11 @@ chroot ${prefix} /usr/bin/apt-get update
if [ "${arch}" = "i386" ]; then if [ "${arch}" = "i386" ]; then
if [ "${dist}" = 'sarge' ]; then if [ "${dist}" = 'sarge' ]; then
logMessage "Disabling TLS" logMessage "Disabling TLS"
mv ${prefix}/lib/tls ${prefix}/lib/tls.disabled mv ${TARGET}/lib/tls ${TARGET}/lib/tls.disabled
mkdir ${prefix}/lib/tls mkdir ${TARGET}/lib/tls
else else
logMessage "Installing xen-aware libc6" logMessage "Installing xen-aware libc6"
installDebianPackage ${prefix} libc6-xen installDebianPackage ${TARGET} libc6-xen
fi fi
fi fi

View File

@@ -9,7 +9,7 @@
# -- # --
# http://nedos.net # http://nedos.net
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -62,19 +62,19 @@ KERNEL_XEN_PKG="linux-image-xen-$XEN_ARCH"
KERNEL_PKG="linux-image-$XEN_ARCH" KERNEL_PKG="linux-image-$XEN_ARCH"
logMessage Attempting to install the $KERNEL_XEN_PKG kernel image logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
logMessage Package $KERNEL_XEN_PKG is available - installing logMessage Package $KERNEL_XEN_PKG is available - installing
installDebianPackage ${prefix} initramfs-tools installDebianPackage ${TARGET} initramfs-tools
installDebianPackage ${prefix} $KERNEL_XEN_PKG installDebianPackage ${TARGET} $KERNEL_XEN_PKG
else else
logMessage Package $KERNEL_XEN_PKG is not available logMessage Package $KERNEL_XEN_PKG is not available
logMessage Attempting to install the $KERNEL_PKG kernel image logMessage Attempting to install the $KERNEL_PKG kernel image
logMessage WARNING: This kernel may not have pvops logMessage WARNING: This kernel may not have pvops
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
logMessage Package $KERNEL_PKG is available - installing logMessage Package $KERNEL_PKG is available - installing
installDebianPackage ${prefix} initramfs-tools installDebianPackage ${TARGET} initramfs-tools
installDebianPackage ${prefix} $KERNEL_PKG installDebianPackage ${TARGET} $KERNEL_PKG
else else
logMessage Package $KERNEL_PKG is not available logMessage Package $KERNEL_PKG is not available
logMessage pygrub set, but kernel could not be installed logMessage pygrub set, but kernel could not be installed
@@ -83,27 +83,27 @@ else
fi fi
fi fi
DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1)) DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g") KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
DOMU_RAMDISK="initrd.img-$KERNEL_REV" DOMU_RAMDISK="initrd.img-$KERNEL_REV"
DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue) DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
# #
# Generate initrd if it does not exist # Generate initrd if it does not exist
# #
if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
logMessage initrd exists, skipping generation logMessage initrd exists, skipping generation
else else
logMessage initrd missing, generating logMessage initrd missing, generating
chroot ${prefix} update-initramfs -c -k $KERNEL_REV chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
fi fi
# #
# Generate a menu.lst for pygrub # Generate a menu.lst for pygrub
# #
generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK" generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
else else

View File

@@ -6,7 +6,7 @@
# -- # --
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -29,15 +29,15 @@ logMessage Script $0 starting
# Default to the same locale as the host. # Default to the same locale as the host.
# #
if [ -e /etc/locale.gen ]; then if [ -e /etc/locale.gen ]; then
cp /etc/locale.gen ${prefix}/etc cp /etc/locale.gen ${TARGET}/etc
fi fi
# #
# Install the package # Install the package
# #
installDebianPackage ${prefix} locales installDebianPackage ${TARGET} locales
installDebianPackage ${prefix} util-linux-locales installDebianPackage ${TARGET} util-linux-locales
chroot ${prefix} /usr/sbin/update-locale LANG=C chroot ${TARGET} /usr/sbin/update-locale LANG=C
# #

View File

@@ -9,7 +9,7 @@
# -- # --
# http://nedos.net # http://nedos.net
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -37,19 +37,19 @@ KERNEL_XEN_PKG="linux-image-xen"
KERNEL_PKG="linux-image-server" KERNEL_PKG="linux-image-server"
logMessage Attempting to install the $KERNEL_XEN_PKG kernel image logMessage Attempting to install the $KERNEL_XEN_PKG kernel image
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_XEN_PKG > /dev/null 2>&1; then
logMessage Package $KERNEL_XEN_PKG is available - installing logMessage Package $KERNEL_XEN_PKG is available - installing
installDebianPackage ${prefix} initramfs-tools installDebianPackage ${TARGET} initramfs-tools
installDebianPackage ${prefix} $KERNEL_XEN_PKG installDebianPackage ${TARGET} $KERNEL_XEN_PKG
else else
logMessage Package $KERNEL_XEN_PKG is not available logMessage Package $KERNEL_XEN_PKG is not available
logMessage Attempting to install the $KERNEL_PKG kernel image logMessage Attempting to install the $KERNEL_PKG kernel image
logMessage WARNING: This kernel may not have pvops logMessage WARNING: This kernel may not have pvops
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
logMessage Package $KERNEL_PKG is available - installing logMessage Package $KERNEL_PKG is available - installing
installDebianPackage ${prefix} initramfs-tools installDebianPackage ${TARGET} initramfs-tools
installDebianPackage ${prefix} $KERNEL_PKG installDebianPackage ${TARGET} $KERNEL_PKG
else else
logMessage Package $KERNEL_PKG is not available logMessage Package $KERNEL_PKG is not available
logMessage pygrub set, but kernel could not be installed logMessage pygrub set, but kernel could not be installed
@@ -58,27 +58,27 @@ else
fi fi
fi fi
DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1)) DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g") KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
DOMU_RAMDISK="initrd.img-$KERNEL_REV" DOMU_RAMDISK="initrd.img-$KERNEL_REV"
DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue) DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
# #
# Generate initrd if it does not exist # Generate initrd if it does not exist
# #
if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
logMessage initrd exists, skipping generation logMessage initrd exists, skipping generation
else else
logMessage initrd missing, generating logMessage initrd missing, generating
chroot ${prefix} update-initramfs -c -k $KERNEL_REV chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
fi fi
# #
# Generate a menu.lst for pygrub # Generate a menu.lst for pygrub
# #
generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK" generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
else else

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -27,14 +27,14 @@ logMessage Script $0 starting
# #
# Remove lines matching 'group' or 'wheel'. # Remove lines matching 'group' or 'wheel'.
# #
grep -v wheel ${prefix}/etc/pam.d/su > ${prefix}/etc/pam.d/su.tmp grep -v wheel ${TARGET}/etc/pam.d/su > ${TARGET}/etc/pam.d/su.tmp
grep -v group ${prefix}/etc/pam.d/su.tmp > ${prefix}/etc/pam.d/su grep -v group ${TARGET}/etc/pam.d/su.tmp > ${TARGET}/etc/pam.d/su
# #
# Make sure permissions are correct. # Make sure permissions are correct.
# #
chown root:root ${prefix}/etc/pam.d/su chown root:root ${TARGET}/etc/pam.d/su
chmod 600 ${prefix}/etc/pam.d/su chmod 600 ${TARGET}/etc/pam.d/su
# #
# Log our finish # Log our finish

View File

@@ -7,7 +7,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -28,7 +28,7 @@ logMessage Script $0 starting
# #
# Make sure we have an /etc/conf.d directory. # Make sure we have an /etc/conf.d directory.
# #
mkdir -p ${prefix}/etc/conf.d mkdir -p ${TARGET}/etc/conf.d
# #
@@ -39,7 +39,7 @@ setupDynamicNetworking ()
# #
# The host is using DHCP. # The host is using DHCP.
# #
cat <<E_O_DHCP > ${prefix}/etc/conf.d/net cat <<E_O_DHCP > ${TARGET}/etc/conf.d/net
# /etc/conf.d/net: # /etc/conf.d/net:
# Global config file for net.* rc-scripts # Global config file for net.* rc-scripts
# #
@@ -70,7 +70,7 @@ setupStaticNetworking ()
# #
# We have a static IP address # We have a static IP address
# #
cat <<E_O_STATIC >${prefix}/etc/conf.d/net cat <<E_O_STATIC >${TARGET}/etc/conf.d/net
# #
# First ethernet interface # First ethernet interface
# #
@@ -89,7 +89,7 @@ E_O_STATIC
logMessage Adding etho:${interface} logMessage Adding etho:${interface}
cat <<E_O_STATIC >>${prefix}/etc/conf.d/net cat <<E_O_STATIC >>${TARGET}/etc/conf.d/net
config_eth0:${interface}=( "{value} netmask "${netmask}" ) config_eth0:${interface}=( "{value} netmask "${netmask}" )
E_O_STATIC E_O_STATIC
@@ -103,12 +103,12 @@ E_O_STATIC
# will be restored after hooks are run. # will be restored after hooks are run.
# #
if [ '' != "$nameserver" ]; then if [ '' != "$nameserver" ]; then
rm -f ${prefix}/etc/resolv.conf.old rm -f ${TARGET}/etc/resolv.conf.old
for ns in $nameserver; do for ns in $nameserver; do
echo "nameserver $ns" >>${prefix}/etc/resolv.conf.old echo "nameserver $ns" >>${TARGET}/etc/resolv.conf.old
done done
else else
cp /etc/resolv.conf ${prefix}/etc/resolv.conf.old cp /etc/resolv.conf ${TARGET}/etc/resolv.conf.old
fi fi
} }

View File

@@ -9,7 +9,7 @@
prefix=$1 TARGET=$1
# #
@@ -44,8 +44,8 @@ umask 022
# #
# Setup the hostname + domain names. # Setup the hostname + domain names.
# #
echo HOSTNAME=\"${name}\" >> ${prefix}/etc/conf.d/hostname echo HOSTNAME=\"${name}\" >> ${TARGET}/etc/conf.d/hostname
echo DNSDOMAIN=\"${domain}\" >> ${prefix}/etc/conf.d/domainname echo DNSDOMAIN=\"${domain}\" >> ${TARGET}/etc/conf.d/domainname
# #
@@ -55,21 +55,21 @@ echo DNSDOMAIN=\"${domain}\" >> ${prefix}/etc/conf.d/domainname
if [ -z "${dhcp}" ]; then if [ -z "${dhcp}" ]; then
# Non-IPv6 stuff. # Non-IPv6 stuff.
grep -v '\(::\|IPv6\)' /etc/hosts > ${prefix}/etc/hosts grep -v '\(::\|IPv6\)' /etc/hosts > ${TARGET}/etc/hosts
# New entry. # New entry.
echo "${ip1} ${hostname}" >> ${prefix}/etc/hosts echo "${ip1} ${hostname}" >> ${TARGET}/etc/hosts
echo " " >> ${prefix}/etc/hosts echo " " >> ${TARGET}/etc/hosts
# IPv6 stuff. # IPv6 stuff.
grep '\(::\|IPv6\)' /etc/hosts >> ${prefix}/etc/hosts grep '\(::\|IPv6\)' /etc/hosts >> ${TARGET}/etc/hosts
else else
# #
# Stub /etc/hosts for DHCP clients. # Stub /etc/hosts for DHCP clients.
# #
cat >> ${prefix}/etc/hosts <<EOF cat >> ${TARGET}/etc/hosts <<EOF
127.0.0.1 localhost 127.0.0.1 localhost
# The following lines are desirable for IPv6 capable hosts # The following lines are desirable for IPv6 capable hosts

View File

@@ -10,7 +10,7 @@
# http://www.steve.org.uk/ # http://www.steve.org.uk/
prefix=$1 TARGET=$1
# #
@@ -32,14 +32,14 @@ logMessage Script $0 starting
# #
# Install ssh # Install ssh
# #
installGentooPackage ${prefix} ssh installGentooPackage ${TARGET} ssh
# #
# Make sure sshd isn't running, this will cause our unmounting of the # Make sure sshd isn't running, this will cause our unmounting of the
# disk image to fail.. # disk image to fail..
# #
chroot ${prefix} /etc/init.d/ssh stop chroot ${TARGET} /etc/init.d/ssh stop
# #

View File

@@ -9,7 +9,7 @@
# -- # --
# http://nedos.net # http://nedos.net
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -37,10 +37,10 @@ KERNEL_PKG="linux-image-virtual"
logMessage Attempting to install the $KERNEL_PKG kernel image logMessage Attempting to install the $KERNEL_PKG kernel image
logMessage WARNING: This kernel may not have pvops logMessage WARNING: This kernel may not have pvops
if chroot ${prefix} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then if chroot ${TARGET} /usr/bin/apt-cache show $KERNEL_PKG > /dev/null 2>&1; then
logMessage Package $KERNEL_PKG is available - installing logMessage Package $KERNEL_PKG is available - installing
installDebianPackage ${prefix} initramfs-tools installDebianPackage ${TARGET} initramfs-tools
installDebianPackage ${prefix} $KERNEL_PKG installDebianPackage ${TARGET} $KERNEL_PKG
else else
logMessage Package $KERNEL_PKG is not available logMessage Package $KERNEL_PKG is not available
logMessage pygrub set, but kernel could not be installed logMessage pygrub set, but kernel could not be installed
@@ -48,27 +48,27 @@ else
exit 1 exit 1
fi fi
DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1)) DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g") KERNEL_REV=$(echo $DOMU_KERNEL | sed "s/vmlinuz-//g")
DOMU_RAMDISK="initrd.img-$KERNEL_REV" DOMU_RAMDISK="initrd.img-$KERNEL_REV"
DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${prefix}/etc/issue) DOMU_ISSUE=$(sed -re "s/ *\\\.*//g" -e1q < ${TARGET}/etc/issue)
# #
# Generate initrd if it does not exist # Generate initrd if it does not exist
# #
if [ -f ${prefix}/boot/$DOMU_RAMDISK ]; then if [ -f ${TARGET}/boot/$DOMU_RAMDISK ]; then
logMessage initrd exists, skipping generation logMessage initrd exists, skipping generation
else else
logMessage initrd missing, generating logMessage initrd missing, generating
chroot ${prefix} update-initramfs -c -k $KERNEL_REV chroot ${TARGET} update-initramfs -c -k $KERNEL_REV
fi fi
# #
# Generate a menu.lst for pygrub # Generate a menu.lst for pygrub
# #
generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK" generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
else else
logMessage pygrub not set, skipping kernel install logMessage pygrub not set, skipping kernel install

View File

@@ -9,7 +9,7 @@
# -- # --
# http://nedos.net # http://nedos.net
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -38,27 +38,27 @@ linux_kernel_type="virtual"
linux_kernel_package="linux-image-${linux_kernel_type}" linux_kernel_package="linux-image-${linux_kernel_type}"
logMessage "Installing the ${linux_kernel_package} kernel image" logMessage "Installing the ${linux_kernel_package} kernel image"
if chroot ${prefix} /usr/bin/apt-cache show ${linux_kernel_package} >/dev/null 2>/dev/null; then if chroot ${TARGET} /usr/bin/apt-cache show ${linux_kernel_package} >/dev/null 2>/dev/null; then
logMessage "Package '${linux_kernel_package}' is available - installing" logMessage "Package '${linux_kernel_package}' is available - installing"
installDebianPackage ${prefix} initramfs-tools installDebianPackage ${TARGET} initramfs-tools
installDebianPackage ${prefix} ${linux_kernel_package} installDebianPackage ${TARGET} ${linux_kernel_package}
# Force initrd if none exists # Force initrd if none exists
echo ${prefix}/boot/initrd* | grep -q 2\\.6 echo ${TARGET}/boot/initrd* | grep -q 2\\.6
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
chroot ${prefix} update-initramfs -c -k `ls -1 ${prefix}/lib/modules/ | head -n 1` chroot ${TARGET} update-initramfs -c -k `ls -1 ${TARGET}/lib/modules/ | head -n 1`
fi fi
# Generate grub menu.lst # Generate grub menu.lst
DOMU_KERNEL=$(basename $(ls -1 ${prefix}/boot/vmlinuz* | tail -n 1)) DOMU_KERNEL=$(basename $(ls -1 ${TARGET}/boot/vmlinuz* | tail -n 1))
DOMU_RAMDISK=$(basename $(ls -1 ${prefix}/boot/initrd*|tail -n 1)) DOMU_RAMDISK=$(basename $(ls -1 ${TARGET}/boot/initrd*|tail -n 1))
DOMU_ISSUE=$(head -n 1 ${prefix}/etc/issue | awk -F '\' '{ print $1 }' | sed 's/[ \t]*$//') DOMU_ISSUE=$(head -n 1 ${TARGET}/etc/issue | awk -F '\' '{ print $1 }' | sed 's/[ \t]*$//')
# #
# Generate a menu.lst for pygrub # Generate a menu.lst for pygrub
# #
generateDebianGrubMenuLst "${prefix}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK" generateDebianGrubMenuLst "${TARGET}" "$DOMU_ISSUE" "$DOMU_KERNEL" "$DOMU_RAMDISK"
else else

View File

@@ -20,10 +20,9 @@ use Exporter 'import';
use vars qw(@EXPORT_OK @EXPORT); use vars qw(@EXPORT_OK @EXPORT);
use English; use English;
use File::Which;
@EXPORT = qw(readConfigurationFile xenRunning runCommand setupAdminUsers @EXPORT = qw(readConfigurationFile xenRunning runCommand setupAdminUsers
findXenToolstack findXenToolstack findBinary
logprint_with_config logonly_with_config fail_with_config); logprint_with_config logonly_with_config fail_with_config);
=head1 FUNCTIONS =head1 FUNCTIONS
@@ -140,6 +139,38 @@ sub xenRunning ($$)
return ($running); return ($running);
} }
=head2 findBinary
=begin doc
Find the location of the specified binary on the curent user's PATH.
Return undef if the named binary isn't found.
=end doc
=cut
sub findBinary
{
my ($bin) = (@_);
# strip any path which might be present.
$bin = $2 if ( $bin =~ /(.*)[\/\\](.*)/ );
foreach my $entry ( split( /:/, $ENV{ 'PATH' } ) )
{
# guess of location.
my $guess = $entry . "/" . $bin;
# return it if it exists and is executable
return $guess if ( -e $guess && -x $guess );
}
return undef;
}
=head2 findXenToolstack =head2 findXenToolstack
=begin doc =begin doc
@@ -161,12 +192,12 @@ sub findXenToolstack
return $toolstack if $toolstack; return $toolstack if $toolstack;
} }
my $xm = which('xm'); my $xm = findBinary('xm');
if ($xm and system("$xm list >/dev/null 2>/dev/null") == 0) { if ($xm and system("$xm list >/dev/null 2>/dev/null") == 0) {
return $xm; return $xm;
} }
my $xl = which('xl'); my $xl = findBinary('xl');
if ($xl and system("$xl list >/dev/null 2>/dev/null") == 0) { if ($xl and system("$xl list >/dev/null 2>/dev/null") == 0) {
return $xl; return $xl;
} }

View File

@@ -8,7 +8,7 @@
# #
prefix=$1 TARGET=$1
@@ -28,16 +28,16 @@ fi
# #
# Update APT lists. # Update APT lists.
# #
chroot ${prefix} /usr/bin/apt-get update chroot ${TARGET} /usr/bin/apt-get update
# #
# Install the packages # Install the packages
# #
installDebianPackage ${prefix} dpkg-dev installDebianPackage ${TARGET} dpkg-dev
installDebianPackage ${prefix} devscripts installDebianPackage ${TARGET} devscripts
installDebianPackage ${prefix} fakeroot installDebianPackage ${TARGET} fakeroot
installDebianPackage ${prefix} debhelper installDebianPackage ${TARGET} debhelper
installDebianPackage ${prefix} build-essential installDebianPackage ${TARGET} build-essential
installDebianPackage ${prefix} lintian installDebianPackage ${TARGET} lintian
installDebianPackage ${prefix} linda installDebianPackage ${TARGET} linda

View File

@@ -6,7 +6,7 @@
# otherwise the temporary mounted directory will not be unmountable. # otherwise the temporary mounted directory will not be unmountable.
# #
prefix=$1 TARGET=$1
# #
# Source our common functions - this will let us install a Debian package. # Source our common functions - this will let us install a Debian package.
@@ -28,20 +28,20 @@ logMessage Script $0 starting
# #
# Install CFengine # Install CFengine
# #
installDebianPackage ${prefix} cfengine2 installDebianPackage ${TARGET} cfengine2
# #
# Make sure the CFengine server isn't running, this will cause our # Make sure the CFengine server isn't running, this will cause our
# unmounting of the disk image to fail.. # unmounting of the disk image to fail..
# #
chroot ${prefix} /etc/init.d/cfengine2 stop chroot ${TARGET} /etc/init.d/cfengine2 stop
# #
# Copy cfengine update.conf & defaults from Dom0 # Copy cfengine update.conf & defaults from Dom0
# #
cp /etc/cfengine/update.conf ${prefix}/etc/cfengine/ cp /etc/cfengine/update.conf ${TARGET}/etc/cfengine/
cp /etc/default/cfengine2 ${prefix}/etc/default/ cp /etc/default/cfengine2 ${TARGET}/etc/default/
# #
# Log our finish # Log our finish

View File

@@ -21,9 +21,9 @@
# #
# Our installation directory + our prefix for finding scripts from. # Our installation directory + our target for finding scripts from.
# #
prefix=$1 TARGET=$1
source=/etc/xen-tools/sed.d/ source=/etc/xen-tools/sed.d/
@@ -59,7 +59,7 @@ fi
for i in `find ${source} -name '*.sed' -print`; do for i in `find ${source} -name '*.sed' -print`; do
# #
# Get the name of the file, minus the source prefix # Get the name of the file, minus the source target
# #
file=${i#$source} file=${i#$source}
@@ -71,17 +71,17 @@ for i in `find ${source} -name '*.sed' -print`; do
# #
# Does the file exist in the new install? # Does the file exist in the new install?
# #
if [ -e "${prefix}/${file}" ]; then if [ -e "${TARGET}/${file}" ]; then
# #
# Log it. # Log it.
# #
logMessage "Running script $i - against ${prefix}/${file}" logMessage "Running script $i - against ${TARGET}/${file}"
# #
# Invoke it. # Invoke it.
# #
sed -i~ -f $i "${prefix}/${file}" sed -i~ -f $i "${TARGET}/${file}"
fi fi
done done

View File

@@ -8,7 +8,7 @@
# #
prefix=$1 TARGET=$1
@@ -28,24 +28,24 @@ fi
# #
# Update APT lists. # Update APT lists.
# #
chroot ${prefix} /usr/bin/apt-get update chroot ${TARGET} /usr/bin/apt-get update
# #
# Install the packages # Install the packages
# #
installDebianPackage ${prefix} xserver-xfree86 installDebianPackage ${TARGET} xserver-xfree86
installDebianPackage ${prefix} vncserver installDebianPackage ${TARGET} vncserver
installDebianPackage ${prefix} xfonts-100dpi installDebianPackage ${TARGET} xfonts-100dpi
installDebianPackage ${prefix} xfonts-75dpi installDebianPackage ${TARGET} xfonts-75dpi
installDebianPackage ${prefix} xfonts-base installDebianPackage ${TARGET} xfonts-base
installDebianPackage ${prefix} rxvt installDebianPackage ${TARGET} rxvt
installDebianPackage ${prefix} gdm installDebianPackage ${TARGET} gdm
installDebianPackage ${prefix} icewm-experimental installDebianPackage ${TARGET} icewm-experimental
# #
# Add a new section to the GDM configuration file. # Add a new section to the GDM configuration file.
# #
cat <<EOF >> ${prefix}/etc/gdm/gdm.conf cat <<EOF >> ${TARGET}/etc/gdm/gdm.conf
[server-VNC] [server-VNC]
name=VNC server name=VNC server
command=/usr/bin/Xvnc -geometry 800x600 -depth 24 command=/usr/bin/Xvnc -geometry 800x600 -depth 24
@@ -56,4 +56,4 @@ EOF
# #
# Make the new section the default # Make the new section the default
# #
perl -pi.bak -e 's/^0=Standard\n//g ; s/^\[servers\]/\[servers\]\n0=VNC/g' ${prefix}/etc/gdm/gdm.conf perl -pi.bak -e 's/^0=Standard\n//g ; s/^\[servers\]/\[servers\]\n0=VNC/g' ${TARGET}/etc/gdm/gdm.conf

View File

@@ -9,7 +9,7 @@
# #
prefix=$1 TARGET=$1
@@ -28,12 +28,12 @@ fi
# #
# Install some new packages - do this first to avoid dependency errors. # Install some new packages - do this first to avoid dependency errors.
# #
installDebianPackage ${prefix} syslog-ng installDebianPackage ${TARGET} syslog-ng
installDebianPackage ${prefix} deborphan installDebianPackage ${TARGET} deborphan
installDebianPackage ${prefix} less installDebianPackage ${TARGET} less
installDebianPackage ${prefix} screen installDebianPackage ${TARGET} screen
installDebianPackage ${prefix} sudo installDebianPackage ${TARGET} sudo
installDebianPackage ${prefix} vim installDebianPackage ${TARGET} vim
# #
@@ -41,28 +41,28 @@ installDebianPackage ${prefix} vim
# #
# PPP stuff. # PPP stuff.
removeDebianPackage ${prefix} pppconfig removeDebianPackage ${TARGET} pppconfig
removeDebianPackage ${prefix} pppoeconf removeDebianPackage ${TARGET} pppoeconf
removeDebianPackage ${prefix} pppoe removeDebianPackage ${TARGET} pppoe
removeDebianPackage ${prefix} ppp removeDebianPackage ${TARGET} ppp
removeDebianPackage ${prefix} libpcap0.7 removeDebianPackage ${TARGET} libpcap0.7
# Editors # Editors
removeDebianPackage ${prefix} nano removeDebianPackage ${TARGET} nano
removeDebianPackage ${prefix} ed removeDebianPackage ${TARGET} ed
removeDebianPackage ${prefix} nvi removeDebianPackage ${TARGET} nvi
# Syslog # Syslog
removeDebianPackage ${prefix} klogd removeDebianPackage ${TARGET} klogd
removeDebianPackage ${prefix} sysklogd removeDebianPackage ${TARGET} sysklogd
# manpages # manpages
removeDebianPackage ${prefix} manpages removeDebianPackage ${TARGET} manpages
removeDebianPackage ${prefix} man-db removeDebianPackage ${TARGET} man-db
removeDebianPackage ${prefix} info removeDebianPackage ${TARGET} info
# misc # misc
removeDebianPackage ${prefix} tasksel tasksel-data removeDebianPackage ${TARGET} tasksel tasksel-data
removeDebianPackage ${prefix} pciutils removeDebianPackage ${TARGET} pciutils
removeDebianPackage ${prefix} fdutils removeDebianPackage ${TARGET} fdutils
removeDebianPackage ${prefix} cpio removeDebianPackage ${TARGET} cpio

View File

@@ -6,7 +6,7 @@
# otherwise the temporary mounted directory will not be unmountable. # otherwise the temporary mounted directory will not be unmountable.
# #
prefix=$1 TARGET=$1
# #
# Source our common functions - this will let us install a Debian package. # Source our common functions - this will let us install a Debian package.
@@ -26,14 +26,14 @@ logMessage Script $0 starting
# #
# Install ssh # Install ssh
# #
installDebianPackage ${prefix} puppet installDebianPackage ${TARGET} puppet
# #
# Make sure sshd isn't running, this will cause our unmounting of the # Make sure sshd isn't running, this will cause our unmounting of the
# disk image to fail.. # disk image to fail..
# #
chroot ${prefix} /etc/init.d/puppet stop chroot ${TARGET} /etc/init.d/puppet stop
# #
# Log our finish # Log our finish

View File

@@ -3,7 +3,7 @@
# This role helps to customize guest's /etc/resolv.conf # This role helps to customize guest's /etc/resolv.conf
# #
prefix=$1 TARGET=$1
# #
# Source our common functions - this will let us install a Debian package. # Source our common functions - this will let us install a Debian package.
@@ -33,7 +33,7 @@ logMessage Script $0 starting
# #
# Create Guest's resolv.conf as resolv.conf.old (see WARNING before) : # Create Guest's resolv.conf as resolv.conf.old (see WARNING before) :
# #
cat <<RESOLV_CONF_EOF >${prefix}/etc/resolv.conf.old cat <<RESOLV_CONF_EOF >${TARGET}/etc/resolv.conf.old
nameserver 192.168.1.1 nameserver 192.168.1.1
#search domain.tld #search domain.tld
RESOLV_CONF_EOF RESOLV_CONF_EOF

View File

@@ -3,7 +3,7 @@
# This role installs sudo with host sudoers file. # This role installs sudo with host sudoers file.
# #
prefix=$1 TARGET=$1
# #
# Source our common functions - this will let us install a Debian package. # Source our common functions - this will let us install a Debian package.
@@ -24,7 +24,7 @@ logMessage Script $0 starting
# #
# Install sudo package # Install sudo package
# #
installDebianPackage ${prefix} sudo installDebianPackage ${TARGET} sudo
# #
# WARNING : # WARNING :
@@ -36,9 +36,9 @@ installDebianPackage ${prefix} sudo
# #
# Copy dom0's file to domU. # Copy dom0's file to domU.
# #
cp /etc/sudoers ${prefix}/etc/ cp /etc/sudoers ${TARGET}/etc/
chown root:root ${prefix}/etc/sudoers chown root:root ${TARGET}/etc/sudoers
chmod 440 ${prefix}/etc/sudoers chmod 440 ${TARGET}/etc/sudoers
# #
# Log our finish # Log our finish

View File

@@ -7,7 +7,7 @@
# -- # --
# #
prefix=$1 TARGET=$1
# #
# Source our common functions # Source our common functions
@@ -28,7 +28,7 @@ logMessage Script $0 starting
# #
# Now let's fixup the fstab # Now let's fixup the fstab
# #
cat <<END_OF_TMPFS_FSTAB >> ${prefix}/etc/fstab cat <<END_OF_TMPFS_FSTAB >> ${TARGET}/etc/fstab
tmpfs /tmp tmpfs rw,nosuid,nodev 0 0 tmpfs /tmp tmpfs rw,nosuid,nodev 0 0
tmpfs /var/run tmpfs rw,nosuid,nodev,noexec,mode=1755 0 0 tmpfs /var/run tmpfs rw,nosuid,nodev,noexec,mode=1755 0 0
tmpfs /var/lock tmpfs rw,nosuid,nodev,noexec 0 0 tmpfs /var/lock tmpfs rw,nosuid,nodev,noexec 0 0

View File

@@ -8,7 +8,7 @@
# #
prefix=$1 TARGET=$1
@@ -25,11 +25,11 @@ fi
# #
# Install udev. # Install udev.
# #
installDebianPackage ${prefix} udev installDebianPackage ${TARGET} udev
# #
# Update APT lists. # Update APT lists.
# #
chroot ${prefix} /usr/bin/apt-get update chroot ${TARGET} /usr/bin/apt-get update

View File

@@ -8,7 +8,7 @@
# #
prefix=$1 TARGET=$1
@@ -27,29 +27,29 @@ fi
# #
# Update APT lists. # Update APT lists.
# #
chroot ${prefix} /usr/bin/apt-get update chroot ${TARGET} /usr/bin/apt-get update
# #
# Install the packages # Install the packages
# #
installDebianPackage ${prefix} xserver-xfree86 installDebianPackage ${TARGET} xserver-xfree86
installDebianPackage ${prefix} vncserver installDebianPackage ${TARGET} vncserver
installDebianPackage ${prefix} xfonts-100dpi installDebianPackage ${TARGET} xfonts-100dpi
installDebianPackage ${prefix} xfonts-75dpi installDebianPackage ${TARGET} xfonts-75dpi
installDebianPackage ${prefix} xfonts-base installDebianPackage ${TARGET} xfonts-base
installDebianPackage ${prefix} rxvt installDebianPackage ${TARGET} rxvt
installDebianPackage ${prefix} xdm installDebianPackage ${TARGET} xdm
installDebianPackage ${prefix} icewm-experimental installDebianPackage ${TARGET} icewm-experimental
# #
# Remove the default settings. # Remove the default settings.
# #
rm ${prefix}/etc/X11/xdm/Xserver rm ${TARGET}/etc/X11/xdm/Xserver
rm ${prefix}/etc/X11/xdm/Xservers rm ${TARGET}/etc/X11/xdm/Xservers
# #
# Setup XDM to use the VNC server we installed. # Setup XDM to use the VNC server we installed.
# #
/bin/echo ':0 /usr/bin/Xvnc /usr/bin/Xvnc -geometry 1024x768 -depth 24' > \ /bin/echo ':0 /usr/bin/Xvnc /usr/bin/Xvnc -geometry 1024x768 -depth 24' > \
${prefix}/etc/X11/xdm/Xservers ${TARGET}/etc/X11/xdm/Xservers