This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".

The branch, master has been updated via a5b2c82327f2e4697393afd1221ccd866e554248 (commit) from a762fcd0370069d7ce00627d5288a7d4a633329f (commit)

Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.

- Log ----------------------------------------------------------------- commit a5b2c82327f2e4697393afd1221ccd866e554248 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Jan 20 22:04:12 2015 +0100

core87: remove useless and time/memory consuming backup.

nearly no user can rollback with this tar.xz because bootloader is changed.

-----------------------------------------------------------------------

Summary of changes: config/rootfiles/common/stage2 | 1 + config/rootfiles/core/86/filelists/files | 1 + config/rootfiles/core/86/update.sh | 28 +--------------------------- 3 files changed, 3 insertions(+), 27 deletions(-)

Difference in files: diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 9a4d8ed..323f978 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -20,6 +20,7 @@ etc/ld.so.conf etc/logrotate.conf etc/mime.types etc/modprobe.d +etc/modprobe.d/btmrvl_sdio.conf etc/modprobe.d/cfg80211.conf etc/modprobe.d/pcspeaker.conf etc/modules.conf diff --git a/config/rootfiles/core/86/filelists/files b/config/rootfiles/core/86/filelists/files index a7e9331..d4622fa 100644 --- a/config/rootfiles/core/86/filelists/files +++ b/config/rootfiles/core/86/filelists/files @@ -1,5 +1,6 @@ etc/system-release etc/issue +etc/modprobe.d/btmrvl_sdio.conf etc/rc.d/init.d/leds opt/pakfire/etc/pakfire.conf usr/lib/firewall/rules.pl diff --git a/config/rootfiles/core/86/update.sh b/config/rootfiles/core/86/update.sh index bdb96fc..bb7453f 100644 --- a/config/rootfiles/core/86/update.sh +++ b/config/rootfiles/core/86/update.sh @@ -24,15 +24,6 @@ . /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=86 @@ -65,23 +56,6 @@ esac # KVER="xxxKVERxxx"

-# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - /var/ipfire/backup/core-upgrade${core}_${KVER}-old.tar.xz -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 -add_to_backup lib/modules -add_to_backup boot - -# Backup the files -tar cJvf /var/ipfire/backup/core-upgrade${core}_${KVER}.tar.xz \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /dev/null 2>&1 - # Check diskspace on root ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`

@@ -232,7 +206,7 @@ echo '/opt/pakfire/pakfire update -y --force' >> /tmp/pak_update echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update echo '/opt/pakfire/pakfire upgrade -y' >> /tmp/pak_update -echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t ipfire "Core-upgrade finished. If you use a customized grub/uboot config"' >> /tmp/pak_update echo '/usr/bin/logger -p syslog.emerg -t ipfire "Check it before reboot !!!"' >> /tmp/pak_update echo '/usr/bin/logger -p syslog.emerg -t ipfire " *** Please reboot... *** "' >> /tmp/pak_update echo 'touch /var/run/need_reboot ' >> /tmp/pak_update

hooks/post-receive -- IPFire 2.x development tree