Merged the auto-startup/shutdown setting from
install.pl script to the rpm file of open-iscsi
Signed-off-by: Doron Shoham <[EMAIL PROTECTED]>
---
install.pl | 22 ----------------------
uninstall.sh | 2 --
2 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/install.pl b/install.pl
index 6a8bc5c..92b4eeb 100755
--- a/install.pl
+++ b/install.pl
@@ -3266,28 +3266,6 @@ sub install_rpm
if ($build32 and $packages_info{$name}{'install32'}) {
install_rpm_32($name);
}
-
- # Set open-iscsi for auto startup
- if ($name eq $packages_info{'open-iscsi-generic'}{'name'}) {
- if ($distro eq "SuSE") {
- $res = system("/sbin/insserv open-iscsi > /dev/null 2>&1");
- if ($res) {
- print RED "Failed to set open-iscsi for auto-startup", RESET
"\n";
- exit 1;
- }
- } elsif ($distro eq "redhat" or $distro eq "redhat5") {
- $res = system("/sbin/chkconfig --del iscsi > /dev/null 2>&1");
- if ($res) {
- print RED "Failed to set open-iscsi for manual startup", RESET
"\n";
- exit 1;
- }
- $res = system("/sbin/chkconfig --add iscsi > /dev/null 2>&1");
- if ($res) {
- print RED "Failed to set open-iscsi for auto-startup", RESET
"\n";
- exit 1;
- }
- }
- }
}
sub print_package_info
diff --git a/uninstall.sh b/uninstall.sh
index 6c665ab..a491e43 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -122,13 +122,11 @@ uninstall()
case ${DISTRIBUTION} in
SuSE)
if ( $RPM -q ${OPEN_ISCSI_SUSE_NAME} > $NULL 2>&1 ) && ( $RPM
--queryformat "[%{VENDOR}]" -q ${OPEN_ISCSI_SUSE_NAME} | grep -i Voltaire >
$NULL 2>&1 ); then
- ex "/sbin/insserv -r open-iscsi"
packs_to_remove="$packs_to_remove ${OPEN_ISCSI_SUSE_NAME}"
fi
;;
redhat)
if ( $RPM -q ${OPEN_ISCSI_REDHAT_NAME} > $NULL 2>&1 ) && ( $RPM
--queryformat "[%{VENDOR}]" -q ${OPEN_ISCSI_REDHAT_NAME} | grep -i Voltaire >
$NULL 2>&1 ); then
- ex "/sbin/chkconfig --del iscsi"
packs_to_remove="$packs_to_remove ${OPEN_ISCSI_REDHAT_NAME}"
fi
;;
--
1.5.3.8
_______________________________________________
ewg mailing list
ewg@lists.openfabrics.org
http://lists.openfabrics.org/cgi-bin/mailman/listinfo/ewg
