webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

updater: remove double files from backup.

Browse Source 
Add some missed files.
This commit is contained in:
Arne Fitzenreiter
2012-11-07 21:13:45 +01:00
parent 0d3e1e8c1d
commit 5e30738231
3 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/rootfiles/core/65/filelists/files
View File

@@ -15,6 +15,6 @@ srv/web/ipfire/cgi-bin/qos.cgi
srv/web/ipfire/cgi-bin/services.cgi
srv/web/ipfire/cgi-bin/updatexlrator.cgi
srv/web/ipfire/cgi-bin/vpnmain.cgi
usr/local/sbin/setup
var/ipfire/langs
var/ipfire/qos/bin/makeqosscripts.pl
usr/local/bin/readhash

1
config/rootfiles/core/65/filelists/setup Symbolic link
View File

@@ -0,0 +1 @@
../../../common/setup

33
config/rootfiles/core/65/update.sh
View File

@@ -24,6 +24,15 @@
. /opt/pakfire/lib/functions.sh
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
function add_to_backup ()
{
# Add path to ROOTFILES but remove old entries to prevent double
# files in the tar
grep -v "^$1" /opt/pakfire/tmp/ROOTFILES > /opt/pakfire/tmp/ROOTFILES.tmp
mv /opt/pakfire/tmp/ROOTFILES.tmp /opt/pakfire/tmp/ROOTFILES
echo $1 >> /opt/pakfire/tmp/ROOTFILES
}
#
# Remove old core updates from pakfire cache to save space...
core=65
@@ -52,12 +61,13 @@ fi
echo First we made a backup of all files that was inside of the
echo update archive. This may take a while ...
# Add some files that are not in the package to backup
echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
echo etc/udev >> /opt/pakfire/tmp/ROOTFILES
echo lib/udev >> /opt/pakfire/tmp/ROOTFILES
echo boot >> /opt/pakfire/tmp/ROOTFILES
echo etc/snort >> /opt/pakfire/tmp/ROOTFILES
echo usr/lib/snort_* >> /opt/pakfire/tmp/ROOTFILES
add_to_backup lib/modules
add_to_backup etc/udev
add_to_backup lib/udev
add_to_backup boot
add_to_backup etc/snort
add_to_backup usr/lib/snort_*
add_to_backup usr/share/zoneinfo
# Backup the files
tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \
@@ -76,12 +86,16 @@ rm -rf /lib/modules/*-ipfire
#
# Remove old udev rules.
#
cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
if [ -e /etc/udev/rules.d/29-ct-server-network.rules ]; then
cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/
fi
cp /etc/udev/rules.d/30-persistent-network.rules /tmp/
rm -rf /etc/udev
rm -rf /lib/udev
mkdir -p /etc/udev/rules.d
mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then
mv /tmp/29-ct-server-network.rules /etc/udev/rules.d/
fi
mv /tmp/30-persistent-network.rules /etc/udev/rules.d/
#
@@ -95,9 +109,10 @@ cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org
/etc/init.d/squid stop
/etc/init.d/ipsec stop
#Remove old snort
#Remove old snort and zoneinfo
rm -rf /etc/snort
rm -rf /usr/lib/snort_*
rm -rf /usr/share/zoneinfo
#
#Extract files