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 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/config/rootfiles/cdrom_corever
@@ -0,0 +1 @@
+5

diff --git a/config/rootfiles/common/apache2 b/config/rootfiles/common/apache2
index 35dcefe88f38243418e32108858301c23b2f000c..5fe29310528f8be90c33661a093285ebb6e93c37 100644 (file)
--- 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 71938e7e02cbb175754c29f3cb6c7a75231a1a8a..4ffe1216d9cb535fd22e963e39564e4a44e6b981 100644 (file)
--- 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 3d30223f789a1711d24c31d1195ba458ff23b952..17a8648970dbc7f8013eee6ef3db0911f31e3d1e 100644 (file)
--- 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 5f5cb1d1fcc91ae93f9770142ef37880325dea8f..cb6319aedf99d8620bafe161a5f126c8b6b43ceb 100644 (file)
--- 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