[SSI] openssi install,1.1.2.22,1.1.2.23 upgrade,1.1.2.4,1.1.2.5

Update of /cvsroot/ssic-linux/openssi
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16272

Modified Files:
      Tag: OPENSSI-RH
        install upgrade 
Log Message:
Merge change from stable branch


Index: upgrade
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/Attic/upgrade,v
retrieving revision 1.1.2.4
retrieving revision 1.1.2.5
diff -u -d -r1.1.2.4 -r1.1.2.5
--- upgrade     13 Apr 2004 21:59:10 -0000      1.1.2.4
+++ upgrade     26 May 2004 20:17:29 -0000      1.1.2.5
@@ -25,8 +25,8 @@
                unless $> == 0;
 
        die "OpenSSI has not been installed. Please run the install script.\n"
-               unless system('bash','-c',
-               "LD_ASSUME_KERNEL=2.4.18 rpm -q kernel-ssi >/dev/null") == 0;
+               unless get_rpminfo_pkg('kernel-ssi', 'NAME')
+               or get_rpminfo_pkg('kernel-ssi-smp', 'NAME');
 
        my (@install, $force);
        print "Checking for base packages...\n";
@@ -47,6 +47,10 @@
        print "\n";
 
        # Upgrade packages
+       if ( get_rpminfo_pkg('kernel-ssi', 'NAME') ) {
+               shell("LD_ASSUME_KERNEL=2.4.18 rpm -e kernel-ssi", 
+                       "Failed to remove old kernel\n");
+       }
        if (@install) {
                my $option = $force ? '--force' : '';
                shell("LD_ASSUME_KERNEL=2.4.18 rpm -Uhv $option @install", 

Index: install
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/Attic/install,v
retrieving revision 1.1.2.22
retrieving revision 1.1.2.23
diff -u -d -r1.1.2.22 -r1.1.2.23
--- install     3 Mar 2004 02:14:43 -0000       1.1.2.22
+++ install     26 May 2004 20:17:29 -0000      1.1.2.23
@@ -48,7 +48,8 @@
 
        die "OpenSSI has already been installed.\n" .
                "If you are upgrading, please run the upgrade script.\n"
-               if get_rpminfo_pkg 'kernel-ssi', 'NAME';
+               if get_rpminfo_pkg('kernel-ssi', 'NAME')
+               or get_rpminfo_pkg('kernel-ssi-smp', 'NAME');
 
        test_grub();
 



-------------------------------------------------------
This SF.Net email is sponsored by: Oracle 10g
Get certified on the hottest thing ever to hit the market... Oracle 10g. 
Take an Oracle 10g class now, and we'll give you the exam FREE.
http://ads.osdn.com/?ad_id=3149&alloc_id=8166&op=click