[node-patches] Change in ovirt-node[master]: rhevh6-post.ks: remove patch to poller.py and update patch t...

[charles_rose at dell.com]

Charles Rose has uploaded a new change for review.

Change subject: rhevh6-post.ks: remove patch to poller.py and update patch to rc.sysinit
......................................................................

rhevh6-post.ks: remove patch to poller.py and update patch to rc.sysinit

poller.py: does not need the libvirt read-only patch as it is native in
rhn-virtualization-common.
rc.sysinit: Fixed failure of the restorecon hunk

Change-Id: I68ef13143438bcf58a98359d96f3bd26a0416037
Signed-off-by: Charles Rose <charles_rose at dell.com>
---
M recipe/rhevh6-post.ks
1 file changed, 5 insertions(+), 37 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/36/7936/1

diff --git a/recipe/rhevh6-post.ks b/recipe/rhevh6-post.ks
index 262464c..200cc76 100644
--- a/recipe/rhevh6-post.ks
+++ b/recipe/rhevh6-post.ks
@@ -75,38 +75,6 @@
 EOF_up2date_patch2
 python -m compileall /usr/share/rhn/up2date_client
 
-patch -d /usr/share/rhn/virtualization -p0 << \EOF_rhn_virt
---- poller.py.orig 2011-04-19 15:53:43.000000000 +0000
-+++ poller.py 2011-09-08 20:45:49.000000000 +0000
-@@ -73,10 +73,9 @@
-         return {}
-
-     try:
--        conn = libvirt.open(None)
-+        conn = libvirt.openReadOnly(None)
-     except libvirt.libvirtError, lve:
-         # virConnectOpen() failed
--        sys.stderr.write("Warning: Could not retrieve virtualization information!\n\tlibvirtd service needs to be running.\n")
-         conn = None
-
-     if not conn:
-@@ -286,10 +285,10 @@
-         vdsm_enabled = True
-
-     # Crawl each of the domains on this host and obtain the new state.
--    if vdsm_enabled:
--        domain_list = poll_through_vdsm()
--    elif libvirt:
-+    if libvirt:
-         domain_list = poll_hypervisor()
-+    elif vdsm_enabled:
-+        domain_list = poll_through_vdsm()
-     else:
-         # If no libvirt nor vdsm is present, this program is pretty much
-         # useless.  Just exit.
-EOF_rhn_virt
-python -m compileall /usr/share/rhn/virtualization
-
 echo "Configuring SELinux"
 # custom module for node specific rules
 mkdir /tmp/SELinux
@@ -245,20 +213,20 @@
 # rhbz#675868
 # Modify rc.sysinit
 patch -d /etc/rc.d -p0 << \EOF_rc_sysinit
---- rc.sysinit.orig	2011-04-06 09:11:18.126385229 -0400
-+++ rc.sysinit	2011-04-06 09:11:04.195923990 -0400
+--- rc.sysinit.orig	2012-09-11 09:41:22.545431354 +0530
++++ rc.sysinit	2012-09-11 09:52:59.619523468 +0530
 @@ -43,7 +43,7 @@
  fi
  
  if [ -n "$SELINUX_STATE" -a -x /sbin/restorecon ] && __fgrep " /dev " /proc/mounts >/dev/null 2>&1 ; then
--	/sbin/restorecon  -R /dev 2>/dev/null
+-	/sbin/restorecon -R -F /dev 2>/dev/null
 +	/sbin/restorecon -e /dev/.initramfs -R /dev 2>/dev/null
  fi
  
  disable_selinux() {
-@@ -495,9 +495,9 @@
- # mounted). Contrary to standard usage,
+@@ -497,9 +497,9 @@
  # filesystems are NOT unmounted in single user mode.
+ # The 'no' applies to all listed filesystem types. See mount(8).
  if [ "$READONLY" != "yes" ] ; then
 -	action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2 -O no_netdev
 +	action $"Mounting local filesystems: " mount -a -t nonfs,nfs4,smbfs,ncpfs,cifs,gfs,gfs2,noproc,nosysfs,nodevpts -O no_netdev


--
To view, visit http://gerrit.ovirt.org/7936
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I68ef13143438bcf58a98359d96f3bd26a0416037
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Charles Rose <charles_rose at dell.com>