Merge branch 'master' into febootstrap

(rpmstrap has been removed from Debian between Etch and Lenny.)

Makefile

@@ -150,13 +150,13 @@ install-hooks:
 	cp -R hooks/fedora-core-6/*-* ${prefix}/usr/lib/xen-tools/fedora-core-6.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-4.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-5.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-7.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-8.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-9.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-10.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-11.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-12.d
-	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-core-13.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-7.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-8.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-9.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-10.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-11.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-12.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s fedora-core-6.d fedora-13.d
 	mkdir -p ${prefix}/usr/lib/xen-tools/debian.d/
 	cp -R hooks/debian/*-* ${prefix}/usr/lib/xen-tools/debian.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sarge.d

TODO

@@ -153,6 +153,10 @@ Maybe for a 4.3 or 5.0 release
    "type" of configuration you want, and a set of options specific to
    that flag could be parsed from xen-tools.conf
 
+* Do not run copyDebFiles on RPM based installations.
+
+  Write a proper clone of it for caching RPMs.
+
 Stuff from Steve's TODO list / Generic TODOs
 --------------------------------------------
 

bin/xen-create-image

@@ -147,7 +147,7 @@ xen-create-image - Easily create new Xen instances with networking and OpenSSH.
   Installation options:
 
    --arch=arch  Pass the given architecture to debootstrap, rinse,
-                or rpmstrap when installing the system.  This argument
+                or febootstrap when installing the system.  This argument
                 is ignored for other install methods.
 
    --dist=dist  Specify the distribution you wish to install.
@@ -347,7 +347,7 @@ Create a Xen configuration file in so that xm can start the new domain.
 
   #
   # Installation method:
-  # One of "copy", "debootstrap", "rinse", "rpmstrap", or "tar".
+  # One of "copy", "debootstrap", "rinse", "febootstrap", or "tar".
   #
   install-method = debootstrap
 
@@ -523,7 +523,7 @@ Create a Xen configuration file in so that xm can start the new domain.
   The new guest images may be installed in several different ways:
 
   1.  Using the debootstrap command, which must be installed and present.
-  2.  Using the rpmstrap command, which must be installed and present.
+  2.  Using the febootstrap command, which must be installed and present.
   3.  using the rinse command, which must be installed and present.
   4.  By copying an existing installation.
   5.  By untarring a file containing a previous installation.
@@ -758,6 +758,25 @@ my $RELEASE = '4.2rc1';
 
 
 
+#
+# Release Aliases
+#
+my %RELEASE_ALIASES = (qw(
+    stentz      fedora-core-4
+    bordeaux    fedora-core-5
+    zod         fedora-core-6
+    moonshine   fedora-7
+    werewolf    fedora-8
+    sulphur     fedora-9
+    cambridge   fedora-10
+    leonidas    fedora-11
+    constantine fedora-12
+    goddard     fedora-13
+    laughlin    fedora-14
+));
+
+
+
 #
 #  Setup default options.
 #
@@ -1687,11 +1706,10 @@ sub checkArguments
     }
 
     #
-    #  NOTE: FAKE!
+    #  Check for release alias names
     #
-    if ( $CONFIG{ 'dist' } eq 'fedora-core4' )
-    {
-        $CONFIG{ 'dist' } = 'stentz';
+    if (exists $RELEASE_ALIASES{$CONFIG{ 'dist' }}) {
+	$CONFIG{ 'dist' } = $RELEASE_ALIASES{$CONFIG{ 'dist' }};
     }
 
     #
@@ -1752,7 +1770,7 @@ E_OR
     if ( defined( $CONFIG{ 'install-method' } ) )
     {
         foreach my $recognised (
-                         qw/ copy debootstrap rinse rpmstrap tar /)
+                         qw/ copy debootstrap rinse febootstrap tar /)
         {
             $valid = 1
               if ( lc( $CONFIG{ 'install-method' } ) eq lc($recognised) );
@@ -1785,7 +1803,7 @@ E_OR
      --install-method=copy        --install-source=/some/path
      --install-method=debootstrap
      --install-method=rinse
-     --install-method=rpmstrap
+     --install-method=febootstrap
      --install-method=tar         --install-source=/some/file.tar
 
 EOF

bin/xt-install-image

@@ -23,7 +23,7 @@ xt-install-image - Install a fresh copy of GNU/Linux into a directory
    --dist           The name of the distribution which has been installed.
 
   Misc Options:
-   --arch           Pass the given arch setting to debootstrap or rpmstrap.
+   --arch           Pass the given arch setting to debootstrap or febootstrap.
    --config         Read the specified config file in addition to the global
                     configuration file.
    --mirror         The mirror to use when installing with 'debootstrap'.
@@ -69,8 +69,8 @@ Copy the given directory recursively.  This local directory is assumed to contai
 =item B<rinse>
 Install the distribution specified by B<--dist> using the rinse command.
 
-=item B<rpmstrap>
-Install the distribution specified by B<--dist> using the rpmstrap command.
+=item B<febootstrap>
+Install the distribution specified by B<--dist> using the febootstrap command.
 
 =item B<tar>
 Untar a .tar file into the new installation location.  This tarfile is assumed to contain a complete archived system.   Specify the directory to copy with the B<--install-source> argument.
@@ -141,8 +141,8 @@ my %dispatch = (
                  "rinse" => { sub        => \&do_rinse,
                               needBinary => "/usr/sbin/rinse",
                             },
-                 "rpmstrap" => { sub        => \&do_rpmstrap,
-                                 needBinary => "/usr/bin/rpmstrap",
+                 "febootstrap" => { sub        => \&do_febootstrap,
+                                 needBinary => "/usr/bin/febootstrap",
                                },
                  "tar" => { sub        => \&do_tar,
                             needBinary => "/bin/tar",
@@ -532,7 +532,7 @@ E_OR
 
      --install-method=copy        --install-source=/some/path
      --install-method=debootstrap
-     --install-method=rpmstrap
+     --install-method=febootstrap
      --install-method=tar         --install-source=/some/file.tar
 
 EOF
@@ -717,29 +717,13 @@ sub do_debootstrap
         print("Done\n");
     }
 
-    #
-    #  Propogate --verbose appropriately.
-    #
-    my $EXTRA = '';
-    if ( $CONFIG{ 'verbose' } )
-    {
-        $EXTRA = ' --verbose';
-    }
-
-    #
-    #  Propogate the --arch argument
-    #
-    if ( $CONFIG{ 'arch' } )
-    {
-        $EXTRA .= " --arch $CONFIG{'arch'}";
-    }
-
-
     #
     #  This is the command we'll run
     #
-    my $command =
-      "$cmd $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $CONFIG{'mirror'}";
+    my $dist = $CONFIG{'dist'};
+    $dist =~ s/fedora-core/fedora/;
+
+    my $command = "$cmd $dist $CONFIG{'location'}";
 
     #
     #  Run the command.
@@ -805,13 +789,13 @@ sub do_rinse
 
 =begin doc
 
-  Install a new distribution of GNU/Linux using the rpmstrap tool.
+  Install a new distribution of GNU/Linux using the febootstrap tool.
 
 =end doc
 
 =cut
 
-sub do_rpmstrap
+sub do_febootstrap
 {
 
     #
@@ -840,7 +824,7 @@ sub do_rpmstrap
     #
     #  The command we're going to run.
     #
-    my $command = "rpmstrap $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $mirror";
+    my $command = "febootstrap $EXTRA $CONFIG{'dist'} $CONFIG{'location'} $mirror";
     runCommand($command);
 }
 

misc/xen-tools

@@ -119,7 +119,7 @@ _xen_create_image()
 	    return 0
 	    ;;
 	--install-method)
-	    COMPREPLY=( $( compgen -W 'copy debootstrap rinse rpmstrap tar'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
+	    COMPREPLY=( $( compgen -W 'copy debootstrap rinse febootstrap tar'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
 	    return 0
 	    ;;
 	--ip)
@@ -360,7 +360,7 @@ complete -F _xt-create-xen-config xt-create-xen-config
 #
 _xt-customize-image()
 {
-    local cur prev dists
+    local cur prev
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
@@ -369,16 +369,9 @@ _xt-customize-image()
     # Determine arguments dynamically.  Avoids out-of-dateness.
     opts=$(xt-customize-image  --help|grep -- --|awk '{print $1}'|grep -- -- | sort -u)
     
-    #
-    # Available distributions, from rpmstrap
-    #
-    if [ -d /usr/lib/rpmstrap/scripts ]; then
-       dists=`/bin/ls -1 /usr/lib/rpmstrap/scripts`
-    fi
-    
     case "$prev" in
 	--dist)
-	    COMPREPLY=( $( compgen -W '${dists} sid sarge etch lenny'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
+	    COMPREPLY=( $( compgen -W 'sid sarge etch lenny'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
 	    return 0
 	    ;;
 	--location)
@@ -401,7 +394,7 @@ complete -F _xt-customize-image xt-customize-image
 #
 _xt-install-image()
 {
-    local cur prev dists
+    local cur prev
 
     COMPREPLY=()
     cur=${COMP_WORDS[COMP_CWORD]}
@@ -411,14 +404,6 @@ _xt-install-image()
     opts=$(xt-install-image  --help|grep -- --|awk '{print $1}'|grep -- -- | sort -u)
 
    
-    #
-    # Available distributions, from rpmstrap
-    #
-    if [ -d /usr/lib/rpmstrap/scripts ]; then
-       dists=`/bin/ls -1 /usr/lib/rpmstrap/scripts`
-    fi
-
-
     case "$prev" in
 	--cache)
 	    COMPREPLY=( $( compgen -W 'yes no'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
@@ -429,11 +414,11 @@ _xt-install-image()
 	    return 0
 	    ;;
 	--dist)
-	    COMPREPLY=( $( compgen -W '${dists} sid sarge etch lenny'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
+	    COMPREPLY=( $( compgen -W 'sid sarge etch lenny'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
 	    return 0
 	    ;;
 	--install-method)
-	    COMPREPLY=( $( compgen -W 'copy debootstrap rinse rpmstrap tar'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
+	    COMPREPLY=( $( compgen -W 'copy debootstrap rinse febootstrap tar'  -- "${COMP_WORDS[COMP_CWORD]}" ) )
 	    return 0
 	    ;;
 	--location)