Revert commit 51982c855d7cc214efc45b647ae51bd2817f52ea

Merged the auto-startup/shutdown setting from
install.pl script to the rpm file of open-iscsi

Signed-off-by: Doron Shoham <dorons@voltaire.com>

diff --git a/install.pl b/install.pl
index 6a8bc5c39d01c6e9a20380639539dc544cc7a3e7..92b4eeb32466bcf83f90e8c5a7d11287f49029d1 100755 (executable)
--- 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 6c665ab118a2bb54fb5a125d64b1d2ef601ec8f7..a491e43f555bbe9519d97f9d39b6344b98edfb65 100755 (executable)
--- 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
         ;;