mkdir -p /install/updater
mkdir -p /install/packages
- find $(DIR_SRC)/config/rootfiles/updater/filelists -maxdepth 1 -type f | xargs cat >> /tmp/ROOTFILES
+ 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'
mv -f /tmp/ROOTFILES /install/updater/ROOTFILES
- tar -x -C /tmp -f /$(SNAME).tar
+ tar --preserve --numeric-owner -x -C /tmp -f /$(SNAME).tar
rm -f /$(SNAME).tar
cd /tmp && tar cf /install/updater/files * && rm -rf *
cat /install/updater/ROOTFILES | grep -v "#" > /install/updater/ROOTFILES.tmp
# Other files
cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
chmod 755 /install/updater/update.sh
- cd /install/updater && tar cf /install/packages/core-upgrade-2.1-17.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/core-upgrade/g" \
-e "s/VER/2.1/g" \
- -e "s/RELEASE/16/g" \
+ -e "s/RELEASE/23/g" \
-e "s/DEPS/$(DEPS)/g" \
- -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-17.ipfire | awk '{ print $$5 }'`/g" \
- < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-17
+ -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