Merge remote branch 'cros/upstream' into tempbranch

client/tools/boottool

 #!/usr/bin/perl
 =head1 NAME
 
 Linux::Bootloader - Base class interacting with Linux bootloaders
 
 =head1 SYNOPSIS
 
         
         my $bootloader = new Linux::Bootloader();
         my $config_file='/boot/grub/menu.lst';
@@ skipping 773 matching lines @@
     } elsif ($arch_style eq 'gentoo') {
         $arch = `uname -m | sed -e s/i.86/x86/ -e s/sun4u/sparc/ -e s/arm.*/arm/ -e s/sa110/arm/ -e s/x86_64/amd64/ -e s/sparc.*/sparc/ -e s/parisc.*/hppa/`;
         chomp $arch;
     } else {
         $arch = `uname -m`;
         chomp $arch;
     }
     return $arch;
 }
 
+=head3 detect_os_vendor()
+
+Input:
+Output: string
+
+This function determines the OS vendor (linux distribution breed).
+
+Return values: "Red Hat", "Fedora", "SUSE", "Ubuntu", "Debian", or
+"Unknown" if none of the predefined patterns could be found on the
+issue file.
+
+=cut
+
+sub detect_os_vendor {
+    my $vendor = "";
+    my $issue_file = '/etc/issue';
+    if ( not system("egrep 'Red Hat' $issue_file") ){
+       $vendor = 'Red Hat';
+    } elsif ( not system("egrep 'Fedora' $issue_file") ){
+       $vendor = 'Fedora';
+    } elsif ( not system("egrep 'SUSE' $issue_file") ){
+       $vendor = 'SUSE';
+    } elsif ( not system("egrep 'Ubuntu' $issue_file") ){
+       $vendor = 'Ubuntu';
+    } elsif ( not system("egrep 'Debian' $issue_file") ){
+       $vendor = 'Debian';
+    } else {
+       $vendor = 'Unknown';
+    }
+    return $vendor;
+}
+
 =head3 detect_bootloader(['device1', 'device2', ...])
 
 Input:  devices to detect against (optional)
 Output: string
 
 This function attempts to determine the bootloader being used on the
 system by first checking for conf files and then falling back to check
 the master boot record.
 
 Possible return values:     
@@ skipping 784 matching lines @@
       }
       $x+=1;
     }
   }
 }
 
 
 sub boot_once {
   my $self=shift;
   my $entry_to_boot_once = shift;
+  my $detected_os_vendor = Linux::Bootloader::Detect::detect_os_vendor();
 
   unless ( $entry_to_boot_once ) { print "No kernel\n"; return undef;}
   $self->read();
   my $default=$self->get_default();
 
+  if ( $self->_get_bootloader_version() < 0.97 ){
+     warn "This function works for grub version 0.97 and up.  No action taken.  \nUpgrade, then re-try.\n";
+     return undef;
+  }
+
+  if ( $detected_os_vendor eq "Red Hat" or $detected_os_vendor eq "Fedora" ) {
+    # if not a number, do title lookup
+    if ( $entry_to_boot_once !~ /^\d+$/ ) {
+      $entry_to_boot_once = $self->_lookup($entry_to_boot_once);
+      return undef unless ( defined $entry_to_boot_once );
+    }
+
+    return `echo "savedefault --default=$entry_to_boot_once" --once | grub --batch`;
+  } else {
   if ( $default == $self->_lookup($entry_to_boot_once)){
      warn "The default and once-boot kernels are the same.  No action taken.  \nSet default to something else, then re-try.\n";
      return undef;
   }
-  if ( $self->_get_bootloader_version() < 0.97 ){
-     warn "This function works for grub version 0.97 and up.  No action taken.  \nUpgrade, then re-try.\n";
-     return undef;
-  }
 
   $self->set_default('saved');
   if ( ! -f '/boot/grub/default' ){
      open FH, '>/boot/grub/default'; 
      my $file_contents="default
 #
 #
 #
 #
 #
 #
 #
 #
 #
 #
 # WARNING: If you want to edit this file directly, do not remove any line
 # from this file, including this warning. Using `grub-set-default\' is
 # strongly recommended.
 ";
     print FH $file_contents;
     close FH;
   }
   $self->set_default( "$entry_to_boot_once" );
   $self->update( 'option'=>'','fallback' => $default );
   $self->update( 'update-kernel'=>"$entry_to_boot_once",'option'=>'','savedefault' => 'fallback' );
   $self->update( 'update-kernel'=>"$default",'option'=>'', 'savedefault' => '' );
   $self->write();
-  
+  }
 }
 
 sub _get_bootloader_version {
   my $self = shift;
   return `grub --version | sed 's/grub (GNU GRUB //' | sed 's/)//'`;
 }
 
 
 1;
 
@@ skipping 1121 matching lines @@
 All Rights Reserved.
 
 This script is free software; you can redistribute it and/or
 modify it under the same terms as Perl itself.
 
 =head1 REVISION
 
 Revision: $Revision: 1.10 $
 
 =cut