[SSI] openssi/openssi-tools/sysadmin ssi-addnode,1.32,1.33 ssi-chnode,1.23,1.24 ssi-ksync,1.11,1.12 ssi-ksync-network,1.17,1.18 ssi-rmnode,1.4,1.5

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

Modified Files:
      Tag: OPENSSI-DEBIAN
        ssi-addnode ssi-chnode ssi-ksync ssi-ksync-network ssi-rmnode 
Log Message:
default value of bootloaderconf now picked distro specific way
: ----------------------------------------------------------------------


Index: ssi-rmnode
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/openssi-tools/sysadmin/ssi-rmnode,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ssi-rmnode  8 Apr 2004 20:44:05 -0000       1.4
+++ ssi-rmnode  20 Jul 2004 04:47:42 -0000      1.5
@@ -26,6 +26,7 @@
 use Clustertab;
 use ssi_mgmt;
 use ssi_utils;
+use ssi_distro;
 
 sub usage () {
        print STDERR
@@ -140,7 +141,6 @@
        rename "/tmp/fstab", "/etc/fstab";
 
        # update dhcpd.conf and rebuild boot materials
-       my $bootloaderconf = "/etc/grub.conf";
        my $msg = "
 Node $node has been successfully removed from the cluster.
 ";

Index: ssi-ksync-network
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/openssi-tools/sysadmin/ssi-ksync-network,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- ssi-ksync-network   18 Jun 2004 00:32:45 -0000      1.17
+++ ssi-ksync-network   20 Jul 2004 04:47:42 -0000      1.18
@@ -38,7 +38,14 @@
 }
 
 # Test for grub.conf
-config='/boot/grub/grub.conf'
+ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e 
s/sa110/arm/`
+if [ -f /etc/debian_version ] &&  [ X$ARCH = Xi386 ]; then 
+       config="/boot/grub/menu.lst"
+elif [ -f /etc/redhat-release ] &&  [ X$ARCH = Xi386 ]; then 
+       config='/boot/grub/grub.conf'
+elif [ X$ARCH = Xalpha ]; then 
+       config="/etc/aboot.conf"
+fi
 #
 # Parse arguments
 #

Index: ssi-ksync
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/openssi-tools/sysadmin/ssi-ksync,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ssi-ksync   26 Apr 2004 16:13:01 -0000      1.11
+++ ssi-ksync   20 Jul 2004 04:47:42 -0000      1.12
@@ -43,7 +43,15 @@
 # Globals
 #
 
-config='/boot/grub/grub.conf'
+ARCH=`uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ -e s/arm.*/arm/ -e 
s/sa110/arm/`
+if [ -f /etc/debian_version ] &&  [ X$ARCH = Xi386 ]; then 
+       config="/boot/grub/menu.lst"
+elif [ -f /etc/redhat-release ] &&  [ X$ARCH = Xi386 ]; then 
+       config="/boot/grub/grub.conf"
+elif [ X$ARCH = Xalpha ]; then 
+       config="/etc/aboot.conf"
+fi
+
 clustertab='/etc/clustertab'
 
 

Index: ssi-addnode
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/openssi-tools/sysadmin/ssi-addnode,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- ssi-addnode 8 Apr 2004 20:44:05 -0000       1.32
+++ ssi-addnode 20 Jul 2004 04:47:42 -0000      1.33
@@ -42,7 +42,7 @@
        --bootdev=value         Boot device path
        --clustertab=value      Cluster node table [/etc/clustertab]
        --varlogfile=value      Logfile for dhcpd [/var/log/messages]
-       --bootloaderconf=value  Bootloader configuration file [/etc/grub.conf]
+       --bootloaderconf=value  Bootloader configuration file [$bootloaderconf]
        --rdclustertab          No prompting. Read info from clustertab file
 ";
        exit(1);
@@ -54,7 +54,6 @@
 
        my $clustertab = "/etc/clustertab";
        my $varlogfile = "/var/log/messages";
-       my $bootloaderconf = "/etc/grub.conf";
        my ($nodenum, $nodename, $hwaddress, $bootprot, $ipaddress);
        my ($initnode, $bootdev, $rdclustertab, $verbose, $help);
 

Index: ssi-chnode
===================================================================
RCS file: /cvsroot/ssic-linux/openssi/openssi-tools/sysadmin/ssi-chnode,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- ssi-chnode  8 Apr 2004 20:44:05 -0000       1.23
+++ ssi-chnode  20 Jul 2004 04:47:42 -0000      1.24
@@ -36,6 +36,7 @@
 use ssi_mgmt;
 use ssi_arch;
 use ssi_utils;
+use ssi_distro;
 
 sub prompt_record {
        my $records = shift;
@@ -86,11 +87,11 @@
 }
 sub usage () {
        print STDERR
-       'usage: ssi-chnode [options]
+       "usage: ssi-chnode [options]
        --help                  (This message)
        --clustertab=value      (Cluster node table (default: /etc/clustertab)
-       --bootloaderconf=value  (Bootloader configuration file (default: 
/etc/grub.conf)
-';
+       --bootloaderconf=value  (Bootloader configuration file (default: 
$bootloaderconf)
+";
        exit 1;
 }
 
@@ -100,7 +101,6 @@
        die "Please run this command as root\n" unless $< == 0;
 
        my $clustertab = "/etc/clustertab";
-       my $bootloaderconf = "/etc/grub.conf";
        my $help = 0 ;
 
        GetOptions("clustertab=s"       => \$clustertab,



-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click