Fix runvdr skript that detects vdradmin as already running vdr

[people/pmueller/ipfire-2.x.git] / lfs / updater

diff --git a/lfs/updater b/lfs/updater
index 993e4293e32dc20f6e38c5b6704f935aa981f874..8a815260d64fafe891bc53b3f755d6ed1ef8d478 100644 (file)
--- a/lfs/updater
+++ b/lfs/updater
@@ -47,29 +47,48 @@ md5 :
 
 $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        rm -rf /install/updater /tmp/*
+       eval $$(cat /usr/src/config/rootfiles/updater/meta)
 
        # Compress files of filelists 
        # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
        mkdir -p /install/updater
-       find $(DIR_SRC)/config/rootfiles/updater/filelists -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
+       mkdir -p /install/packages
+
+       find $(DIR_SRC)/config/rootfiles/updater/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES
+       cat /tmp/ROOTFILES \
+               | grep -v "etc/httpd/conf" \
+               | grep -v "etc/ssl/openssl.cnf" \
+               | grep -v "etc/ssh/sshd_config" \
+               | grep -v "etc/ipsec.conf" \
+               | grep -v "etc/ipsec.secrets" \
+               | grep -v "etc/snort/snort.conf" \
+               | grep -v "etc/squid/squid.conf" \
+               | grep -v "srv/web/ipfire/html/proxy.pac" \
+               | grep -v "srv/web/ipfire/html/wpad.dat" \
+               > /tmp/ROOTFILESNEW
+       mv -f /tmp/ROOTFILESNEW /tmp/ROOTFILES
        sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
        tar -c -C / --files-from=/tmp/ROOTFILES \
                -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
                --exclude='proc/*' --exclude='tmp/ROOTFILES'
-       rm -f /tmp/ROOTFILES
-       tar -x -C /tmp -f /$(SNAME).tar
+       mv -f /tmp/ROOTFILES /install/updater/ROOTFILES
+       tar --preserve --numeric-owner -x  -C /tmp -f /$(SNAME).tar
        rm -f /$(SNAME).tar
        cd /tmp && tar cf /install/updater/files * && rm -rf *
-       tar tf /install/updater/files > /install/updater/ROOTFILES
+       cat /install/updater/ROOTFILES | grep -v "#" > /install/updater/ROOTFILES.tmp
+       rm /install/updater/ROOTFILES
+       mv /install/updater/ROOTFILES.tmp /install/updater/ROOTFILES
+
        # Other files
        cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
        chmod 755 /install/updater/update.sh
-       cd /install/updater && tar cf ../packages/updater-$(SNAME)-$(VERSION).ipfire \
+       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-23.ipfire \
                update.sh files ROOTFILES
        rm -rf /install/updater
-#      sed -e "s/NAME/updater/g" \
-#              -e "s/VER/$(VERSION)/g" \
-#              -e "s/RELEASE/$$(basename $@)/g" \
-#              -e "s/DEPS/$(DEPS)/g" \
-#              -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-$(VERSION)-$$(basename $@).ipfire | awk '{ print $$5 }'`/g" \
-#              < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-$$(basename $@)
+
+       sed -e "s/NAME/core-upgrade/g" \
+               -e "s/VER/2.1/g" \
+               -e "s/RELEASE/23/g" \
+               -e "s/DEPS/$(DEPS)/g" \
+               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-23.ipfire | awk '{ print $$5 }'`/g" \
+               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-23