stp-svn

[stp-svn] SF.net SVN: stp: [322] trunk/Test-Sut/lib/Test/Sut/Kernel.pm

[<jud...@us...>]

Revision: 322
Author:   judith_osdl
Date:     2006-07-21 14:12:00 -0700 (Fri, 21 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/stp/?rev=322&view=rev

Log Message:
-----------
This is a little hack for gentoo for now until I get the initrd working.

Modified Paths:
--------------
    trunk/Test-Sut/lib/Test/Sut/Kernel.pm
Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm
===================================================================
--- trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-21 17:46:02 UTC (rev 321)
+++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-21 21:12:00 UTC (rev 322)
@@ -58,7 +58,9 @@
     $res = 0 unless ( -f "linux/System.map" and -f "linux/arch/$arch/boot/bzImage" );
     unless ($self->kernel_version()){ $self->{'_ERR'}='compile_kernel'; return 0; }
  
-    system "mkinitrd -v -f /boot/initrd-STP.img $self->{'kernel_version'} &> $ENV{ 'SYSTEM_LOGS' }/mkinitrd.txt";
+    unless ( -f '/etc/gentoo-release' ){
+        system "mkinitrd -v -f /boot/initrd-STP.img $self->{'kernel_version'} &> $ENV{ 'SYSTEM_LOGS' }/mkinitrd.txt";
+    }
 
     # We are done if there were no errors
     return 1 if ( $res );
@@ -141,7 +143,6 @@
     # set up the hash to be passed to the add() function
     my %bootloader_hash = ( 'force' => 1,
                             'add-kernel'    => '/boot/vmlinuz-STP',
-                            'initrd'        => '/boot/initrd-STP.img',
                             'title'         => 'STP',
                             'args'          => $boot_opts,
                             'savedefault'   => $default,
@@ -154,6 +155,9 @@
     if ( $myargs ){
         $bootloader_hash->{'args'} .= $myargs;
     }
+    if ( -f '/boot/initrd-STP.img' ){
+        $bootloader_hash->{'initrd'} = '/boot/initrd-STP.img';
+    }
 
     # force the kernel to be added just in case we need to overwrite an old one
     $bootloader->add( %bootloader_hash );


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[stp-svn] SF.net SVN: stp: [323] trunk/Test-Sut/lib/Test/Sut/Kernel.pm

[<jud...@us...>]

Revision: 323
Author:   judith_osdl
Date:     2006-07-21 15:00:24 -0700 (Fri, 21 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/stp/?rev=323&view=rev

Log Message:
-----------
The detectbootloader call is NOT OO.

Modified Paths:
--------------
    trunk/Test-Sut/lib/Test/Sut/Kernel.pm
Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm
===================================================================
--- trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-21 21:12:00 UTC (rev 322)
+++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-21 22:00:24 UTC (rev 323)
@@ -189,7 +189,7 @@
                     );
 
     # use Linux::Bootloader to set boot once for the STP kernel
-    my $detected_bootloader = Linux::Bootloader::Detect->detect_bootloader();
+    my $detected_bootloader = Linux::Bootloader::Detect::detect_bootloader();
     if ( ! $detected_bootloader ){
         $detected_bootloader='grub';
     }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[stp-svn] SF.net SVN: stp: [329] trunk/Test-Sut/lib/Test/Sut/Kernel.pm

[<jud...@us...>]

Revision: 329
Author:   judith_osdl
Date:     2006-07-28 15:51:49 -0700 (Fri, 28 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/stp/?rev=329&view=rev

Log Message:
-----------
Fix the initrd and other hash settings.

Modified Paths:
--------------
    trunk/Test-Sut/lib/Test/Sut/Kernel.pm
Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm
===================================================================
--- trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-28 20:39:03 UTC (rev 328)
+++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-28 22:51:49 UTC (rev 329)
@@ -150,13 +150,13 @@
                             'boot-once'     => 1
                           );
     if ( $myroot ){
-        $bootloader_hash->{'root'} = $myroot;
+        $bootloader_hash{'root'} = $myroot;
     }
     if ( $myargs ){
-        $bootloader_hash->{'args'} .= $myargs;
+        $bootloader_hash{'args'} .= $myargs;
     }
     if ( -f '/boot/initrd-STP.img' ){
-        $bootloader_hash->{'initrd'} = '/boot/initrd-STP.img';
+        $bootloader_hash{'initrd'} = '/boot/initrd-STP.img';
     }
 
     # force the kernel to be added just in case we need to overwrite an old one


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[stp-svn] SF.net SVN: stp: [330] trunk/Test-Sut/lib/Test/Sut/Kernel.pm

[<jud...@us...>]

Revision: 330
Author:   judith_osdl
Date:     2006-07-31 10:47:27 -0700 (Mon, 31 Jul 2006)
ViewCVS:  http://svn.sourceforge.net/stp/?rev=330&view=rev

Log Message:
-----------
Add a space to fix these kernel arguments.

Modified Paths:
--------------
    trunk/Test-Sut/lib/Test/Sut/Kernel.pm
Modified: trunk/Test-Sut/lib/Test/Sut/Kernel.pm
===================================================================
--- trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-28 22:51:49 UTC (rev 329)
+++ trunk/Test-Sut/lib/Test/Sut/Kernel.pm	2006-07-31 17:47:27 UTC (rev 330)
@@ -153,7 +153,7 @@
         $bootloader_hash{'root'} = $myroot;
     }
     if ( $myargs ){
-        $bootloader_hash{'args'} .= $myargs;
+        $bootloader_hash{'args'} .= ' ' . $myargs;
     }
     if ( -f '/boot/initrd-STP.img' ){
         $bootloader_hash{'initrd'} = '/boot/initrd-STP.img';


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.