From ad6649144c4b3529dbcdd9bee450bef7ffdd622c Mon Sep 17 00:00:00 2001 From: yinle Date: Mon, 20 Jan 2014 13:25:36 -0800 Subject: [PATCH] fix bug #3973 Ubuntu 13.10 diskful installation fails --- xCAT/debian/install | 1 + xCAT/debian/postinst | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/xCAT/debian/install b/xCAT/debian/install index b6975959d..edd37eb13 100644 --- a/xCAT/debian/install +++ b/xCAT/debian/install @@ -1,4 +1,5 @@ xcat.conf etc/apache2/conf.d/ +xcat.conf.apach24 etc/apache2/conf.d/ 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 68a15f6a8..9215ea63b 100644 --- a/xCAT/debian/postinst +++ b/xCAT/debian/postinst @@ -40,6 +40,13 @@ 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/ + fi + /etc/init.d/apache2 restart ;;