mirror of
				https://github.com/xcat2/xcat-core.git
				synced 2025-10-31 11:22:27 +00:00 
			
		
		
		
	correct the build spec and script
This commit is contained in:
		
							
								
								
									
										1
									
								
								makerpm
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								makerpm
									
									
									
									
									
								
							| @@ -85,6 +85,7 @@ function makexcat { | ||||
| 			cd `dirname $0`/$RPMNAME | ||||
| 			tar --exclude .svn -czf $RPMROOT/SOURCES/license.tar.gz LICENSE.html | ||||
| 			cp xcat.conf $RPMROOT/SOURCES | ||||
| 			cp xcat.conf.apach24 $RPMROOT/SOURCES | ||||
| 			cp xCATSN $RPMROOT/SOURCES | ||||
| 			cd - >/dev/null | ||||
| 		elif [ "$RPMNAME" = "xCAT-buildkit" ]; then | ||||
|   | ||||
| @@ -171,7 +171,7 @@ then | ||||
|    cp /etc/httpd/conf.d/xcat.conf.apach24 /etc/httpd/conf.d/xcat.conf | ||||
| elif [ -n "$(apachectl -v 2>&1 |grep -e '^Server version\s*:.*\/2.4')" ] | ||||
| then  | ||||
|    rm -rf /etc/httpd/conf.d/xcat.conf | ||||
|    rm -rf /etc/apache2/conf.d/xcat.conf | ||||
|    cp /etc/apache2/conf.d/xcat.conf.apach24 /etc/apache2/conf.d/xcat.conf | ||||
| else | ||||
|    rm -rf /etc/httpd/conf.d/xcat.conf | ||||
|   | ||||
		Reference in New Issue
	
	Block a user