1
0
mirror of synced 2026-01-21 01:48:09 +00:00

Merge commit '9e43d6a'

This commit is contained in:
Axel Beckert 2010-07-15 18:47:16 +02:00
commit b898cdb064
2 changed files with 17 additions and 14 deletions

View File

@ -9,13 +9,17 @@ mirror for DomUs on Debian and Ubuntu Dom0s.
=head1 SYNOPSIS
xt-guess-suite-and-mirror [-s] [-m]
-s show suite
-m show mirror
--suite Show suite
--mirror Show mirror
Shows both if no parameter is given.
Help Options:
--help Show the help information for this script.
--manual Show the manual for this script.
--version Show the version number and exit.
=cut
=head1 DESCRIPTION
@ -86,21 +90,20 @@ my $want_mirror = 0;
my $want_suite = 0;
my $want_version = 0;
my $want_help = 0;
my $want_usage = 0;
my $want_manual = 0;
my $result = GetOptions ('mirror' => \$want_mirror,
my $result = GetOptions( 'mirror' => \$want_mirror,
'suite' => \$want_suite,
'version' => \$want_version,
'usage' => \$want_usage,
'help' => \$want_help);
'manual' => \$want_manual,
'help' => \$want_help );
if ($want_help) {
print "Usage: $0 [-m] [-s]\n";
exit 0;
pod2usage(0);
}
if ($want_usage) {
pod2usage(0);
if ($want_manual) {
pod2usage( -verbose => 2 );
}
if (-r $sources_list_file) {

View File

@ -130,7 +130,7 @@ memory = 128Mb # Memory size
swap = 128Mb # Swap size
# noswap = 1 # Don't use swap at all for the new system.
fs = ext3 # use the EXT3 filesystem for the disk image.
dist = `xt-guess-suite-and-mirror -s` # Default distribution to install.
dist = `xt-guess-suite-and-mirror --suite` # Default distribution to install.
image = sparse # Specify sparse vs. full disk images.
#
@ -241,7 +241,7 @@ initrd = /boot/initrd.img-`uname -r`
#
# The default mirror for debootstrap to install Debian-derived distributions
#
mirror = `xt-guess-suite-and-mirror -m`
mirror = `xt-guess-suite-and-mirror --mirror`
#
# A mirror suitable for use when installing the Dapper release of Ubuntu.