From 30d891e34162146a92b6817d5342f3e5d59a0f24 Mon Sep 17 00:00:00 2001
From: immarvin <yangsbj@cn.ibm.com>
Date: Mon, 12 May 2014 01:46:04 -0700
Subject: [PATCH] fix defect #4123 [fvt]2.8.4:ubuntu 12.04 diskfull install
 failed

---
 xCAT/debian/dirs     |  1 +
 xCAT/debian/install  |  2 +-
 xCAT/debian/postinst | 10 ++++------
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/xCAT/debian/dirs b/xCAT/debian/dirs
index ef4317183..7fed8339e 100644
--- a/xCAT/debian/dirs
+++ b/xCAT/debian/dirs
@@ -5,4 +5,5 @@ install/prescripts
 install/kdump
 opt/xcat/share/xcat
 etc/apache2/conf.d
+etc/apache2/conf-enabled
 opt/xcat/share/doc/packages/xCAT
diff --git a/xCAT/debian/install b/xCAT/debian/install
index edd37eb13..ab485abda 100644
--- a/xCAT/debian/install
+++ b/xCAT/debian/install
@@ -1,5 +1,5 @@
 xcat.conf etc/apache2/conf.d/
-xcat.conf.apach24 etc/apache2/conf.d/
+xcat.conf.apach24 etc/apache2/conf-enabled
 LICENSE.html opt/xcat/share/doc/packages/xCAT
 postscripts/* install/postscripts/
 prescripts/* install/prescripts/
diff --git a/xCAT/debian/postinst b/xCAT/debian/postinst
index bf457cc40..6e6d4cebc 100644
--- a/xCAT/debian/postinst
+++ b/xCAT/debian/postinst
@@ -40,12 +40,10 @@ case "$1" in
 	else
 	    xcatconfig -i -d -s
 	fi
-        ver=$(cat /etc/issue |awk '{print $2}')
-        num=${ver%.*}
-        file="xcat.conf.apach24"
-        if [ $num -gt 12 ];then
-            mv /etc/apache2/conf.d/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf
-        fi
+        
+#        [ -e /etc/apache2/conf-enabled/xcat.conf ] && rm /etc/apache2/conf-enabled/xcat.conf
+#        mv /etc/apache2/conf-enabled/xcat.conf.apach24 /etc/apache2/conf-enabled/xcat.conf
+
 	/etc/init.d/apache2 restart
     ;;