From: arne_f <arne_f@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Date: Sun, 27 Jan 2008 09:53:08 +0000 (+0000)
Subject: fixed updatecache path on cdrom
X-Git-Tag: v2.3-beta1~217
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=5db10f476c90304d2c5fcaf453d63e5b4693ee55

fixed updatecache path on cdrom
added coreversion magic to cdrom
added all files from core's to cdrom


git-svn-id: http://svn.ipfire.org/svn/ipfire/branches/2.1/trunk@1162 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
---

diff --git a/config/rootfiles/cdrom_corever b/config/rootfiles/cdrom_corever
new file mode 100644
index 0000000000..7ed6ff82de
--- /dev/null
+++ b/config/rootfiles/cdrom_corever
@@ -0,0 +1 @@
+5
diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 35dcefe88f..5fe2931052 100644
--- a/config/rootfiles/common/apache2
+++ b/config/rootfiles/common/apache2
@@ -1658,6 +1658,6 @@ srv/web/ipfire/html
 #srv/web/ipfire/html/themes/ipfire/include/colours.txt
 #srv/web/ipfire/html/themes/ipfire/include/functions.pl
 #srv/web/ipfire/html/themes/ipfire/include/style.css
-#srv/web/ipfire/html/updatecache
+/var/updatecache
 #srv/web/ipfire/html/updatecache/download
 #srv/web/ipfire/html/updatecache/metadata
diff --git a/lfs/apache2 b/lfs/apache2
index 71938e7e02..4ffe1216d9 100644
--- a/lfs/apache2
+++ b/lfs/apache2
@@ -85,7 +85,8 @@ ifeq "$(PASS)" "C"
 	-find /etc/httpd/conf -name .svn -exec rm -rf {} \;
 
 	# Copy all html/cgi-bin files
-	mkdir -p /srv/web/ipfire/{cgi-bin,html/updatecache/{download,metadata}}
+	mkdir -p /srv/web/ipfire/{cgi-bin,html}
+	mkdir -p /var/updatecache/{download,metadata}
 	cp -aR $(DIR_SRC)/html/* /srv/web/ipfire
 	-find /srv/web/ipfire -name .svn -exec rm -rf {} \;
 
diff --git a/lfs/cdrom b/lfs/cdrom
index 3d30223f78..17a8648970 100644
--- a/lfs/cdrom
+++ b/lfs/cdrom
@@ -48,11 +48,14 @@ md5 :
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	rm -rf /install/cdrom /tmp/*
 
+	cp -f $(DIR_SRC)/config/rootfiles/cdrom_corever /opt/pakfire/db/core/mine
+
 	# Compress root filesystem
 	# Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
 	mkdir -p /install/cdrom/doc
 	find $(DIR_SRC)/config/rootfiles/common -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
 	find $(DIR_SRC)/config/rootfiles/ver_$(ED) -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
+	find $(DIR_SRC)/config/rootfiles/core/*/files -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
 	sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
 
 	tar -c -C / --files-from=/tmp/ROOTFILES \
diff --git a/lfs/squid b/lfs/squid
index 5f5cb1d1fc..cb6319aedf 100644
--- a/lfs/squid
+++ b/lfs/squid
@@ -114,12 +114,12 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 	ln -fs /bin/false /var/ipfire/updatexlrator/autocheck/cron.weekly
 
 	chown -R nobody:nobody /var/ipfire/updatexlrator
-	chown nobody.squid /srv/web/ipfire/html/updatecache
-	chown nobody.squid /srv/web/ipfire/html/updatecache/download
-	chown nobody.squid /srv/web/ipfire/html/updatecache/metadata
-	chmod 775 /srv/web/ipfire/html/updatecache
-	chmod 775 /srv/web/ipfire/html/updatecache/download
-	chmod 775 /srv/web/ipfire/html/updatecache/metadata
+	chown nobody.squid /var/updatecache
+	chown nobody.squid /var/updatecache/download
+	chown nobody.squid /var/updatecache/metadata
+	chmod 775 /var/updatecache
+	chmod 775 /var/updatecache/download
+	chmod 775 /var/updatecache/metadata
 	chmod 755 /var/log/updatexlrator
 	
 	chown squid:squid /var/log/squid