X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;ds=sidebyside;f=config%2Frootfiles%2Fcore%2F66%2Fupdate.sh;h=d764c4322b46ed081909e1c6a791bfc439bb33b0;hb=83f1971428fa456462ee24ad6f0baab12f1ae8d7;hp=815ff7d7e73ffa15a78b52b3990f832766e249f9;hpb=83601a06bc8036b21e9b6c6911c8096e35bd443d;p=people%2Fteissler%2Fipfire-2.x.git diff --git a/config/rootfiles/core/66/update.sh b/config/rootfiles/core/66/update.sh index 815ff7d7e..d764c4322 100644 --- a/config/rootfiles/core/66/update.sh +++ b/config/rootfiles/core/66/update.sh @@ -17,7 +17,7 @@ # along with IPFire; if not, write to the Free Software # # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # # # -# Copyright (C) 2012 IPFire-Team . # +# Copyright (C) 2013 IPFire-Team . # # # ############################################################################ # @@ -44,6 +44,32 @@ done # # Do some sanity checks. +case $(uname -r) in + *-ipfire-versatile ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update. versatile support is dropped." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; + *-ipfire-xen ) + BOOTSIZE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f2 | tail -n 1` + if [ $BOOTSIZE -lt 28000 ]; then + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update because not enough space on boot." + exit 2 + fi + ;; + *-ipfire* ) + # Ok. + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: ERROR cannot update. No IPFire Kernel." + # Report no error to pakfire. So it does not try to install it again. + exit 0 + ;; +esac + if [ ! "$(mount | grep " reiser4 (")" == "" ]; then /usr/bin/logger -p syslog.emerg -t ipfire \ "core-update-$core: ERROR cannot update because there is a reiser4 fs mounted." @@ -52,8 +78,8 @@ fi # # -KVER="3.2.34" -MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +KVER="3.2.37" +MOUNT=`grep "kernel" /boot/grub/grub.conf 2>/dev/null | tail -n 1 ` # Nur den letzten Parameter verwenden echo $MOUNT > /dev/null MOUNT=$_ @@ -85,10 +111,11 @@ add_to_backup usr/share/terminfo add_to_backup etc/sysconfig/lm_sensors add_to_backup etc/sysconfig/rc.local add_to_backup usr/local/bin/vpn-watch +add_to_backup usr/local/bin/updxsetperms add_to_backup usr/libexec/ipsec # Backup the files -tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ +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 @@ -100,6 +127,9 @@ if [ $ROOTSPACE -lt 70000 ]; then exit 2 fi +# Add user nobody to group squid. +usermod -a -G squid nobody + echo echo Update Kernel to $KVER ... # @@ -132,16 +162,21 @@ if [ -e /tmp/rules.d/29-ct-server-network.rules ]; then fi mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ -# -# Backup grub.conf -# -cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org - +case $(uname -m) in + i?86 ) + # + # Backup grub.conf + # + cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + ;; +esac # #Stop services /etc/init.d/snort stop /etc/init.d/squid stop /etc/init.d/ipsec stop +/etc/init.d/apache stop + #Remove old snort, zoneinfo and ncurses-libs(wrong path). rm -rf /etc/snort @@ -153,16 +188,60 @@ rm -rf /lib/libncurses* rm -f /usr/libexec/ipsec/{pluto,_pluto_adns,whack} rm -f /usr/local/bin/vpn-watch +# Remove update accelerator permissions script. +rm -f /usr/local/bin/updxsetperms + # #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/* + tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p \ + --numeric-owner -C / --wildcards 'boot/*-kirkwood*' + ;; + * ) + /usr/bin/logger -p syslog.emerg -t ipfire \ + "core-update-$core: FATAL-ERROR space run out on boot. System is not bootable..." + /etc/init.d/apache start + exit 4 + ;; + esac +fi + +# +#Reload init to close old linker/glibc +telinit u + # Regenerate ipsec configuration files. /srv/web/ipfire/cgi-bin/vpnmain.cgi +# Convert OpenVPN RW connections. +/usr/sbin/ovpn-ccd-convert + +touch /var/ipfire/ovpn/ccd.conf +touch /var/ipfire/ovpn/ccdroute +touch /var/ipfire/ovpn/ccdroute2 +chown nobody:nobody /var/ipfire/ovpn/ccd.conf +chown nobody:nobody /var/ipfire/ovpn/ccdroute +chown nobody:nobody /var/ipfire/ovpn/ccdroute2 + +# Update crontab. +sed -i /var/spool/cron/root.orig \ + -e 's@^.*fcron.weekly.*$@\&nice(10),bootrun 47 2 \* \* 1\ttest -x /usr/local/bin/run-parts \&\& /usr/local/bin/run-parts /etc/fcron.weekly@' +fcrontab -z &>/dev/null + # # Start services # +/etc/init.d/apache start /etc/init.d/squid start /etc/init.d/snort start if [ `grep "ENABLED=on" /var/ipfire/vpn/settings` ]; then @@ -181,40 +260,44 @@ fi # Remove preloading libsafe. rm -f /etc/ld.so.preload -# -# Modify grub.conf -# -echo -echo Update grub configuration ... -ROOT=`mount | grep " / " | cut -d" " -f1` - -if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` -fi - -if [ ! -z $ROOTUUID ]; then - sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf -else - sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf -fi -sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf -sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf - -if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then - echo "grub use default console ..." -else - echo "grub use serial console ..." - sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf - sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf - sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf - sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf -fi - -# -# ReInstall grub -# -grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck - +case $(uname -m) in + i?86 ) + # + # Modify grub.conf + # + echo + echo Update grub configuration ... + ROOT=`mount | grep " / " | cut -d" " -f1` + + if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + fi + + if [ ! -z $ROOTUUID ]; then + sed -i "s|ROOT|UUID=$ROOTUUID|g" /boot/grub/grub.conf + else + sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf + fi + sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf + sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf + + if [ "$(grep "^serial" /boot/grub/grub.conf.org)" == "" ]; then + echo "grub use default console ..." + else + echo "grub use serial console ..." + sed -i -e "s|splashimage|#splashimage|g" /boot/grub/grub.conf + sed -i -e "s|#serial|serial|g" /boot/grub/grub.conf + sed -i -e "s|#terminal|terminal|g" /boot/grub/grub.conf + sed -i -e "s| panic=10 | console=ttyS0,115200n8 panic=10 |g" /boot/grub/grub.conf + fi + + # + # ReInstall grub + # + echo "(hd0) ${ROOT::`expr length $ROOT`-1}" > /boot/grub/device.map + grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} + ;; +esac # # Delete old lm-sensor modullist to force search at next boot # @@ -238,16 +321,25 @@ rm -rf /opt/pakfire/db/*/meta-glib # Force (re)install pae kernel if pae is supported rm -rf /opt/pakfire/db/*/meta-linux-pae if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then - echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae - echo "ProgVersion: 3.2.34" >> /opt/pakfire/db/installed/meta-linux-pae - echo "Release: 23" >> /opt/pakfire/db/installed/meta-linux-pae + 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 8000 -o $ROOTSPACE -lt 70000 ]; 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: 3.2.37" >> /opt/pakfire/db/installed/meta-linux-pae + echo "Release: 26" >> /opt/pakfire/db/installed/meta-linux-pae + fi fi # Force reinstall xen kernel if it was installed if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen - echo "Release: 23" >> /opt/pakfire/db/installed/meta-linux-xen + echo "Release: 24" >> /opt/pakfire/db/installed/meta-linux-xen + # Add xvc0 to /etc/securetty + echo "xvc0" >> /etc/securetty fi #