[node-patches] Change in ovirt-node[master]: move all virt-manager-tui config to ovirt specific recipes

[mburns at redhat.com]

Michael Burns has uploaded a new change for review.

Change subject: move all virt-manager-tui config to ovirt specific recipes
......................................................................

move all virt-manager-tui config to ovirt specific recipes

virt-manager tui is not included in all derivative builds, so
only include it in the upstream image.

Change-Id: Ia4a541a010be40be5be1a11029dc6d86a5a5888a
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M recipe/archipel-post.ks
M recipe/common-post.ks
M recipe/ovirt17-post.ks
3 files changed, 23 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/89/12089/1

diff --git a/recipe/archipel-post.ks b/recipe/archipel-post.ks
index d9726b1..3926197 100644
--- a/recipe/archipel-post.ks
+++ b/recipe/archipel-post.ks
@@ -125,6 +125,15 @@
 
 python -m compileall /usr/share/virt-manager
 
+#Add some upstream specific rwtab entries
+cat >> /etc/rwtab.d/ovirt << \EOF_rwtab_ovirt2
+dirs    /root/.virt-manager
+dirs    /admin/.virt-manager
+EOF_rwtab_ovirt2
+
+# create .virt-manager directories for readonly root
+mkdir -p /root/.virt-manager /home/admin/.virt-manager
+
 echo "Configuring SELinux"
 # custom module for node specific rules
 mkdir /tmp/SELinux
@@ -204,4 +213,4 @@
 sed -i "/# Default-Start:.*/d" /etc/init.d/archipel
 sed -i "/# Default-Stop:.*/d" /etc/init.d/archipel
 
-/sbin/service zfs-fuse stop 2>/dev/null
\ No newline at end of file
+/sbin/service zfs-fuse stop 2>/dev/null
diff --git a/recipe/common-post.ks b/recipe/common-post.ks
index c6d2368..c202c19 100644
--- a/recipe/common-post.ks
+++ b/recipe/common-post.ks
@@ -101,8 +101,6 @@
 dirs    /var/lib/dnsmasq
 files	/root/.ssh
 dirs	/root/.uml
-dirs	/root/.virt-manager
-dirs	/home/admin/.virt-manager
 files	/var/cache/libvirt
 files	/var/empty/sshd/etc/localtime
 files	/var/lib/libvirt
@@ -210,12 +208,6 @@
 
 #mount kernel debugfs
 echo "debugfs /sys/kernel/debug debugfs auto 0 0" >> /etc/fstab
-
-# create .virt-manager directories for readonly root
-mkdir -p /root/.virt-manager /home/admin/.virt-manager
-
-#symlink virt-manager-tui pointer file to .pyc version
-sed -i "s/tui.py/tui.pyc/g" /usr/bin/virt-manager-tui
 
 #symlink ovirt-config-setup into $PATH
 ln -s /usr/libexec/ovirt-config-setup /usr/sbin/setup
diff --git a/recipe/ovirt17-post.ks b/recipe/ovirt17-post.ks
index e212b21..d350e83 100644
--- a/recipe/ovirt17-post.ks
+++ b/recipe/ovirt17-post.ks
@@ -142,3 +142,16 @@
 
 # Workaround for vdsm needing /etc/ovirt-node-image-release
 ln -s /etc/system-release /etc/ovirt-node-image-release
+
+#Add some upstream specific rwtab entries
+cat >> /etc/rwtab.d/ovirt << \EOF_rwtab_ovirt2
+dirs    /root/.virt-manager
+dirs    /admin/.virt-manager
+EOF_rwtab_ovirt2
+
+# create .virt-manager directories for readonly root
+mkdir -p /root/.virt-manager /home/admin/.virt-manager
+
+#symlink virt-manager-tui pointer file to .pyc version
+sed -i "s/tui.py/tui.pyc/g" /usr/bin/virt-manager-tui
+


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia4a541a010be40be5be1a11029dc6d86a5a5888a
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Michael Burns <mburns at redhat.com>