diff options
| author | Simon Rettberg | 2020-12-18 09:06:31 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2020-12-18 09:06:31 +0100 |
| commit | 768d604686552e9aee1b9e7b27a7506c351013be (patch) | |
| tree | 32724828b81b2d35c2d2db564f356411eaa06ea4 /satellit_installer | |
| parent | [SSPS] Refactor static_files: Submodules with tree (diff) | |
| download | setup-scripts-768d604686552e9aee1b9e7b27a7506c351013be.tar.gz setup-scripts-768d604686552e9aee1b9e7b27a7506c351013be.tar.xz setup-scripts-768d604686552e9aee1b9e7b27a7506c351013be.zip | |
[SSPS] Fix vmware SCSI timeout increase
Diffstat (limited to 'satellit_installer')
3 files changed, 2 insertions, 17 deletions
diff --git a/satellit_installer/includes/30-set_vmware_device_timeout.inc b/satellit_installer/includes/30-set_vmware_device_timeout.inc deleted file mode 100644 index 07a8e04..0000000 --- a/satellit_installer/includes/30-set_vmware_device_timeout.inc +++ /dev/null @@ -1,13 +0,0 @@ -set_vmware_device_timeout() { - # this is a rather primitive solution - if [ ! -f /etc/udev/rules.d/99-vmware-scsi-udev.rules ]; then - cat > /etc/udev/rules.d/99-vmware-scsi-udev.rules<<-ENDE - # Redhat systems - ACTION=="add", BUS=="scsi", SYSFS{vendor}=="VMware, " , SYSFS{model}=="VMware Virtual S", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" - # Debian systems - ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware " , ATTRS{model}=="Virtual disk ", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" - # SuSE / Ubuntu systems - ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware, " , ATTRS{model}=="VMware Virtual S", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" - ENDE - fi -} diff --git a/satellit_installer/satellit_installer b/satellit_installer/satellit_installer index d56039b..33aaefc 100755 --- a/satellit_installer/satellit_installer +++ b/satellit_installer/satellit_installer @@ -141,10 +141,6 @@ config_nfs install_system_scripts -# Sometimes a low device timeout has lead to problems. So we set a rule to increase the -# block device timeout (sd*) from 30 to 180 using an udev rule. -set_vmware_device_timeout - # color prompt, aliases patch_bashrc # vim config diff --git a/satellit_installer/static_files/system/etc/udev/rules.d/99-vmware-scsi-udev.rules b/satellit_installer/static_files/system/etc/udev/rules.d/99-vmware-scsi-udev.rules new file mode 100644 index 0000000..5e16722 --- /dev/null +++ b/satellit_installer/static_files/system/etc/udev/rules.d/99-vmware-scsi-udev.rules @@ -0,0 +1,2 @@ +# Increase timeout from 30 seconds to 3 minutes +ACTION=="add|change", ENV{ID_VENDOR}=="VMware*" , ENV{ID_MODEL}=="*Virtual*", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'" |