diff options
| author | Václav Pavlín <vpavlin@redhat.com> | 2013-11-14 14:57:00 +0100 |
|---|---|---|
| committer | Václav Pavlín <vpavlin@redhat.com> | 2013-11-14 14:57:00 +0100 |
| commit | f9a6c0385f49bdcd8db02ce3d5128a856077e889 (patch) | |
| tree | 97bad1bae0dd2176f9df2eb10c57669837e82d96 | |
| parent | 5a3663709b4db467c30289fd520928a8c1498a2b (diff) | |
| download | initscripts-f9a6c0385f49bdcd8db02ce3d5128a856077e889.tar initscripts-f9a6c0385f49bdcd8db02ce3d5128a856077e889.tar.gz initscripts-f9a6c0385f49bdcd8db02ce3d5128a856077e889.tar.bz2 initscripts-f9a6c0385f49bdcd8db02ce3d5128a856077e889.tar.xz initscripts-f9a6c0385f49bdcd8db02ce3d5128a856077e889.zip | |
Revert "provide KVM guest count and limit info message (#1014731)"
This reverts commit ab49daff755b83b3d4f46402844196bf7f804e20.
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rw-r--r-- | udev/rules.d/81-kvm-rhel.rules | 1 | ||||
| -rwxr-xr-x | udev/udev-kvm-check | 49 |
3 files changed, 0 insertions, 52 deletions
diff --git a/initscripts.spec b/initscripts.spec index de838dd4..9901fa94 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -187,7 +187,6 @@ rm -rf $RPM_BUILD_ROOT %attr(2755,root,root) /usr/sbin/netreport /usr/lib/udev/rules.d/* /usr/lib/udev/rename_device -/usr/lib/udev/udev-kvm-check /usr/sbin/service /usr/sbin/ppp-watch %{_mandir}/man*/* @@ -208,7 +207,6 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0600,root,utmp) /var/log/btmp %ghost %attr(0664,root,utmp) /var/log/wtmp %ghost %attr(0664,root,utmp) /var/run/utmp -%ghost %attr(0644,root,root) /etc/sysconfig/kvm %ghost %verify(not md5 size mtime) %config(noreplace,missingok) /etc/crypttab %dir /usr/lib/tmpfiles.d /usr/lib/tmpfiles.d/initscripts.conf diff --git a/udev/rules.d/81-kvm-rhel.rules b/udev/rules.d/81-kvm-rhel.rules deleted file mode 100644 index 787cad62..00000000 --- a/udev/rules.d/81-kvm-rhel.rules +++ /dev/null @@ -1 +0,0 @@ -DEVPATH=="*/kvm", ACTION=="change", RUN+="/lib/udev/udev-kvm-check $env{COUNT} $env{EVENT}" diff --git a/udev/udev-kvm-check b/udev/udev-kvm-check deleted file mode 100755 index f8a9921e..00000000 --- a/udev/udev-kvm-check +++ /dev/null @@ -1,49 +0,0 @@ -#! /bin/sh - -if test -f /etc/sysconfig/kvm; then - . /etc/sysconfig/kvm -fi - -: ${THRESHOLD:=0} -COUNT=$1 -EVENT=$2 - -if [ "$THRESHOLD" -eq 0 ]; then - level=user.debug -else - level=user.info -fi - -subscr_msg="your Red Hat Enterprise Linux subscription limit is $THRESHOLD" -subscr_msg="$subscr_msg guests. Please review your Red Hat Enterprise Linux" -subscr_msg="$subscr_msg subscription agreement or contact your Red Hat" -subscr_msg="$subscr_msg support representative for more information. You" -subscr_msg="$subscr_msg may review the Red Hat Enterprise subscription" -subscr_msg="$subscr_msg limits at http://www.redhat.com/rhel-virt-limits" - -case $COUNT in - 1) guests=guest ;; - *) guests=guests ;; -esac - -case $EVENT in - create) - if [ "$THRESHOLD" -eq 0 ]; then - msg="$COUNT $guests now active" - elif [ $COUNT -gt "$THRESHOLD" ]; then - level=user.warning - msg="$COUNT $guests are currently active; $subscr_msg" - fi - ;; - terminate) - if [ $COUNT -ge "$THRESHOLD" ]; then - msg="$COUNT $guests now active" - fi - ;; -esac - -if [ -n "$msg" ]; then - logger -p $level "KVM: $msg" -fi -exit 0 - |