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, next has been updated via 03022f412ef2d4cfd0bad133988f2cc3312728d1 (commit) via 593e2eeb0320285c309686668b73744973d0a944 (commit) via 88cc99094805eb3133cac3eec0005844f5904721 (commit) via f83c50537bcb4b74bebcff83f86f69b60def544f (commit) from 822b4313d1029bcfa19ec6cc2f36da128001ab24 (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 03022f412ef2d4cfd0bad133988f2cc3312728d1 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 8 20:29:59 2016 +0100

core100: ship openssl (build with new gcc)

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 593e2eeb0320285c309686668b73744973d0a944 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 8 20:28:12 2016 +0100

core100: ship glibc (build with new gcc)

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit 88cc99094805eb3133cac3eec0005844f5904721 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 8 20:01:49 2016 +0100

core100: add kernel to updater

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

commit f83c50537bcb4b74bebcff83f86f69b60def544f Author: Arne Fitzenreiter arne_f@ipfire.org Date: Tue Mar 8 19:31:49 2016 +0100

core100: add function to set last correct installed core on update.

Signed-off-by: Arne Fitzenreiter arne_f@ipfire.org

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

Summary of changes: .../98 => core/100}/filelists/armv5tel/glibc | 0 .../100}/filelists/armv5tel/linux-kirkwood | 0 .../95 => core/100}/filelists/armv5tel/linux-multi | 0 .../95 => core/100}/filelists/armv5tel/linux-rpi | 0 .../{oldcore/98 => core/100}/filelists/i586/glibc | 0 .../{oldcore/95 => core/100}/filelists/i586/linux | 0 .../95 => core/100}/filelists/i586/linux-initrd | 0 .../97 => core/100}/filelists/i586/openssl-sse2 | 0 .../98 => core/100}/filelists/x86_64/glibc | 0 .../95 => core/100}/filelists/x86_64/linux | 0 .../95 => core/100}/filelists/x86_64/linux-initrd | 0 config/rootfiles/core/100/update.sh | 195 ++++++++++++++++++++- 12 files changed, 191 insertions(+), 4 deletions(-) copy config/rootfiles/{oldcore/98 => core/100}/filelists/armv5tel/glibc (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/armv5tel/linux-kirkwood (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/armv5tel/linux-multi (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/armv5tel/linux-rpi (100%) copy config/rootfiles/{oldcore/98 => core/100}/filelists/i586/glibc (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/i586/linux (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/i586/linux-initrd (100%) copy config/rootfiles/{oldcore/97 => core/100}/filelists/i586/openssl-sse2 (100%) copy config/rootfiles/{oldcore/98 => core/100}/filelists/x86_64/glibc (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/x86_64/linux (100%) copy config/rootfiles/{oldcore/95 => core/100}/filelists/x86_64/linux-initrd (100%)

Difference in files: diff --git a/config/rootfiles/core/100/filelists/armv5tel/glibc b/config/rootfiles/core/100/filelists/armv5tel/glibc new file mode 120000 index 0000000..4c70d72 --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood new file mode 120000 index 0000000..7217107 --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-multi b/config/rootfiles/core/100/filelists/armv5tel/linux-multi new file mode 120000 index 0000000..204eb4c --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/linux-multi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-multi \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/armv5tel/linux-rpi b/config/rootfiles/core/100/filelists/armv5tel/linux-rpi new file mode 120000 index 0000000..a651a49 --- /dev/null +++ b/config/rootfiles/core/100/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/glibc b/config/rootfiles/core/100/filelists/i586/glibc new file mode 120000 index 0000000..943021f --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux b/config/rootfiles/core/100/filelists/i586/linux new file mode 120000 index 0000000..693ec4b --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/linux-initrd b/config/rootfiles/core/100/filelists/i586/linux-initrd new file mode 120000 index 0000000..32a03e6 --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/linux-initrd @@ -0,0 +1 @@ +../../../../common/i586/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/i586/openssl-sse2 b/config/rootfiles/core/100/filelists/i586/openssl-sse2 new file mode 120000 index 0000000..f424713 --- /dev/null +++ b/config/rootfiles/core/100/filelists/i586/openssl-sse2 @@ -0,0 +1 @@ +../../../../common/i586/openssl-sse2 \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/glibc b/config/rootfiles/core/100/filelists/x86_64/glibc new file mode 120000 index 0000000..1119099 --- /dev/null +++ b/config/rootfiles/core/100/filelists/x86_64/glibc @@ -0,0 +1 @@ +../../../../common/x86_64/glibc \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/linux b/config/rootfiles/core/100/filelists/x86_64/linux new file mode 120000 index 0000000..0615b5b --- /dev/null +++ b/config/rootfiles/core/100/filelists/x86_64/linux @@ -0,0 +1 @@ +../../../../common/x86_64/linux \ No newline at end of file diff --git a/config/rootfiles/core/100/filelists/x86_64/linux-initrd b/config/rootfiles/core/100/filelists/x86_64/linux-initrd new file mode 120000 index 0000000..1b9fff7 --- /dev/null +++ b/config/rootfiles/core/100/filelists/x86_64/linux-initrd @@ -0,0 +1 @@ +../../../../common/x86_64/linux-initrd \ No newline at end of file diff --git a/config/rootfiles/core/100/update.sh b/config/rootfiles/core/100/update.sh index 8745ff1..a547431 100644 --- a/config/rootfiles/core/100/update.sh +++ b/config/rootfiles/core/100/update.sh @@ -24,36 +24,223 @@ . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1

-# Remove old core updates from pakfire cache to save space... +function find_device() { + local mountpoint="${1}" + + local root + local dev mp fs flags rest + while read -r dev mp fs flags rest; do + # Skip unwanted entries + [ "${dev}" = "rootfs" ] && continue + + if [ "${mp}" = "${mountpoint}" ] && [ -b "${dev}" ]; then + root="$(basename "${dev}")" + break + fi + done < /proc/mounts + + # Get the actual device from the partition that holds / + while [ -n "${root}" ]; do + if [ -e "/sys/block/${root}" ]; then + echo "${root}" + return 0 + fi + + # Remove last character + root="${root::-1}" + done + + return 1 +} + + core=100 + +function exit_with_error() { + # Set last succesfull installed core. + echo $(($core-1)) > /opt/pakfire/db/core/mine + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: $1" + exit $2 +} + +# Remove old core updates from pakfire cache to save space... for (( i=1; i<=$core; i++ )) do rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire done

+# +# Do some sanity checks. +case $(uname -r) in + *-ipfire* ) + # Ok. + ;; + * ) + exit_with_error "ERROR cannot update. No IPFire Kernel." 1 + ;; +esac + + +# +# +KVER="xxxKVERxxx" + +# Check diskspace on root +ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $ROOTSPACE -lt 100000 ]; then + exit_with_error "ERROR cannot update because not enough free space on root." 2 + exit 2 +fi + +echo +echo Update Kernel to $KVER ... +# +# Remove old kernel, configs, initrd, modules, dtb's ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/initramfs-* +rm -rf /boot/vmlinuz-* +rm -rf /boot/uImage-ipfire-* +rm -rf /boot/uInit-ipfire-* +rm -rf /boot/dtb-*-ipfire-* +rm -rf /lib/modules + +case "$(uname -m)" in + armv*) + # Backup uEnv.txt if exist + if [ -e /boot/uEnv.txt ]; then + cp -vf /boot/uEnv.txt /boot/uEnv.txt.org + fi + + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + mkdir -pv /boot/dtb-$KVER-ipfire-multi +#to do add touch for arm kernel and initrd here + ;; +esac + # Stop services +/etc/init.d/snort stop /etc/init.d/squid stop /etc/init.d/dnsmasq stop +/etc/init.d/ipsec stop +/etc/init.d/ntp stop +/etc/init.d/apache stop +

# Extract files -extract_files +tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C / + + + +# Check diskspace on boot +BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + +if [ $BOOTSPACE -lt 1000 ]; then + case $(uname -r) in + *-ipfire-kirkwood ) + # Special handling for old kirkwood images. + # (install only kirkwood kernel) + rm -rf /boot/* + # work around the u-boot folder detection bug + mkdir -pv /boot/dtb-$KVER-ipfire-kirkwood + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /etc/init.d/apache start + exit_with_error "FATAL-ERROR space run out on boot. System is not bootable..." 4 + ;; + esac +fi + +# restart init because the glibc was updated. +telinit u

# Fix hardening flags in grub paxctl -mpexs /usr/bin/grub-script-check

+# Regenerate IPsec configuration +sudo -u nobody /srv/web/ipfire/cgi-bin/vpnmain.cgi + # Update Language cache -# /usr/local/bin/update-lang-cache +/usr/local/bin/update-lang-cache

+# # Start services +# +/etc/init.d/apache start +/etc/init.d/ntp start /etc/init.d/dnsmasq start /etc/init.d/sshd restart /etc/init.d/squid start +/etc/init.d/snort start +if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then + /etc/init.d/ipsec start +fi

# Delete old QoS enabled indicator rm -f /var/ipfire/qos/enable

+# Upadate Kernel version uEnv.txt +if [ -e /boot/uEnv.txt ]; then + sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt +fi + +# call user update script (needed for some arm boards) +if [ -e /boot/pakfire-kernel-update ]; then + /boot/pakfire-kernel-update ${KVER} +fi + +case "$(uname -m)" in + i?86) + # Force (re)install pae kernel if pae is supported + rm -rf /opt/pakfire/db/installed/meta-linux-pae + if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then + ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1` + if [ $BOOTSPACE -lt 12000 -o $ROOTSPACE -lt 90000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-${core}: WARNING not enough space for pae kernel." + else + echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae + echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae + fi + fi + ;; +esac +# +# After pakfire has ended run it again and update the lists and do upgrade +# +echo '#!/bin/bash' > /tmp/pak_update +echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do' >> /tmp/pak_update +echo ' sleep 1' >> /tmp/pak_update +echo 'done' >> /tmp/pak_update +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/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 +# +killall -KILL pak_update +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + # This update need a reboot... -#touch /var/run/need_reboot +touch /var/run/need_reboot

# Finish /etc/init.d/fireinfo start

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