[IPFire-SCM] [git.ipfire.org] IPFire 2.x development tree branch, master, updated. c1db56367201e69f44d40369533a4e54338686a5
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 c1db56367201e69f44d40369533a4e54338686a5 (commit) from e95ea70202ccdb16f2371cb4bbbe871239bf33c0 (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 c1db56367201e69f44d40369533a4e54338686a5 Author: Arne Fitzenreiter arne_f@ipfire.org Date: Sat Nov 27 12:08:54 2010 +0100
Update to 2.9 is now core43.
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/core/43/exclude | 6 + .../rootfiles/core/{test => 43}/filelists/apache2 | 0 config/rootfiles/core/{test => 43}/filelists/attr | 0 config/rootfiles/core/{test => 43}/filelists/cpio | 0 .../rootfiles/core/{test => 43}/filelists/dnsmasq | 0 .../rootfiles/core/{test => 43}/filelists/dracut | 0 config/rootfiles/core/43/filelists/files | 10 + .../core/{test => 43}/filelists/findutils | 0 config/rootfiles/core/{test => 43}/filelists/grub | 0 config/rootfiles/core/{test => 43}/filelists/iw | 0 .../rootfiles/core/{test => 43}/filelists/libcap | 0 config/rootfiles/core/{test => 43}/filelists/linux | 0 .../core/{test => 43}/filelists/linux-firmware | 0 .../core/{test => 43}/filelists/smartmontools | 0 config/rootfiles/core/{test => 43}/filelists/squid | 0 .../core/{test => 43}/filelists/strongswan | 0 config/rootfiles/core/{test => 43}/filelists/tcl | 0 config/rootfiles/core/{test => 43}/filelists/udev | 0 .../core/{test => 43}/filelists/usb_modeswitch | 0 .../{test => 43}/filelists/usb_modeswitch_data | 0 .../rootfiles/core/{test => 43}/filelists/wireless | 0 .../core/{test => 43}/filelists/wpa_supplicant | 0 config/rootfiles/core/43/update.sh | 179 ++++++++++++++++-- config/rootfiles/core/test/exclude | 6 - config/rootfiles/core/test/filelists/files | 11 - config/rootfiles/core/test/meta | 1 - config/rootfiles/core/test/update.sh | 203 -------------------- 27 files changed, 183 insertions(+), 233 deletions(-) rename config/rootfiles/core/{test => 43}/filelists/apache2 (100%) rename config/rootfiles/core/{test => 43}/filelists/attr (100%) rename config/rootfiles/core/{test => 43}/filelists/cpio (100%) rename config/rootfiles/core/{test => 43}/filelists/dnsmasq (100%) rename config/rootfiles/core/{test => 43}/filelists/dracut (100%) rename config/rootfiles/core/{test => 43}/filelists/findutils (100%) rename config/rootfiles/core/{test => 43}/filelists/grub (100%) rename config/rootfiles/core/{test => 43}/filelists/iw (100%) rename config/rootfiles/core/{test => 43}/filelists/libcap (100%) rename config/rootfiles/core/{test => 43}/filelists/linux (100%) rename config/rootfiles/core/{test => 43}/filelists/linux-firmware (100%) rename config/rootfiles/core/{test => 43}/filelists/smartmontools (100%) rename config/rootfiles/core/{test => 43}/filelists/squid (100%) rename config/rootfiles/core/{test => 43}/filelists/strongswan (100%) rename config/rootfiles/core/{test => 43}/filelists/tcl (100%) rename config/rootfiles/core/{test => 43}/filelists/udev (100%) rename config/rootfiles/core/{test => 43}/filelists/usb_modeswitch (100%) rename config/rootfiles/core/{test => 43}/filelists/usb_modeswitch_data (100%) rename config/rootfiles/core/{test => 43}/filelists/wireless (100%) rename config/rootfiles/core/{test => 43}/filelists/wpa_supplicant (100%) delete mode 100644 config/rootfiles/core/test/exclude delete mode 100644 config/rootfiles/core/test/filelists/files delete mode 100644 config/rootfiles/core/test/meta delete mode 100644 config/rootfiles/core/test/update.sh
Difference in files: diff --git a/config/rootfiles/core/43/exclude b/config/rootfiles/core/43/exclude index e69de29..c2bceb8 100644 --- a/config/rootfiles/core/43/exclude +++ b/config/rootfiles/core/43/exclude @@ -0,0 +1,6 @@ +etc/udev/rules.d/30-persistent-network.rules +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache diff --git a/config/rootfiles/core/43/filelists/apache2 b/config/rootfiles/core/43/filelists/apache2 new file mode 120000 index 0000000..eef95ef --- /dev/null +++ b/config/rootfiles/core/43/filelists/apache2 @@ -0,0 +1 @@ +../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/attr b/config/rootfiles/core/43/filelists/attr new file mode 120000 index 0000000..c808017 --- /dev/null +++ b/config/rootfiles/core/43/filelists/attr @@ -0,0 +1 @@ +../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/cpio b/config/rootfiles/core/43/filelists/cpio new file mode 120000 index 0000000..fbab21a --- /dev/null +++ b/config/rootfiles/core/43/filelists/cpio @@ -0,0 +1 @@ +../../../common/cpio \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/dnsmasq b/config/rootfiles/core/43/filelists/dnsmasq new file mode 120000 index 0000000..d469c74 --- /dev/null +++ b/config/rootfiles/core/43/filelists/dnsmasq @@ -0,0 +1 @@ +../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/dracut b/config/rootfiles/core/43/filelists/dracut new file mode 120000 index 0000000..1608699 --- /dev/null +++ b/config/rootfiles/core/43/filelists/dracut @@ -0,0 +1 @@ +../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/files b/config/rootfiles/core/43/filelists/files index 0037af1..eb3c951 100644 --- a/config/rootfiles/core/43/filelists/files +++ b/config/rootfiles/core/43/filelists/files @@ -1 +1,11 @@ etc/system-release +etc/rc.d/init.d/checkfs +etc/rc.d/init.d/checkfstab +etc/rc.d/init.d/squid +srv/web/ipfire/cgi-bin/proxy.cgi +srv/web/ipfire/cgi-bin/speed.cgi +srv/web/ipfire/cgi-bin/vpnmain.cgi +srv/web/ipfire/html/images/urlfilter/copy.gif +var/ipfire/general-functions.pl +usr/local/bin/rebuild-initrd +usr/bin/ldd diff --git a/config/rootfiles/core/43/filelists/findutils b/config/rootfiles/core/43/filelists/findutils new file mode 120000 index 0000000..545280a --- /dev/null +++ b/config/rootfiles/core/43/filelists/findutils @@ -0,0 +1 @@ +../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/grub b/config/rootfiles/core/43/filelists/grub new file mode 120000 index 0000000..050745c --- /dev/null +++ b/config/rootfiles/core/43/filelists/grub @@ -0,0 +1 @@ +../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/iw b/config/rootfiles/core/43/filelists/iw new file mode 120000 index 0000000..7c58a20 --- /dev/null +++ b/config/rootfiles/core/43/filelists/iw @@ -0,0 +1 @@ +../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/libcap b/config/rootfiles/core/43/filelists/libcap new file mode 120000 index 0000000..ed67d95 --- /dev/null +++ b/config/rootfiles/core/43/filelists/libcap @@ -0,0 +1 @@ +../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/linux b/config/rootfiles/core/43/filelists/linux new file mode 120000 index 0000000..c469fe1 --- /dev/null +++ b/config/rootfiles/core/43/filelists/linux @@ -0,0 +1 @@ +../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/linux-firmware b/config/rootfiles/core/43/filelists/linux-firmware new file mode 120000 index 0000000..4bf91bc --- /dev/null +++ b/config/rootfiles/core/43/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/smartmontools b/config/rootfiles/core/43/filelists/smartmontools new file mode 120000 index 0000000..fb66daf --- /dev/null +++ b/config/rootfiles/core/43/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/squid b/config/rootfiles/core/43/filelists/squid new file mode 120000 index 0000000..2dc8372 --- /dev/null +++ b/config/rootfiles/core/43/filelists/squid @@ -0,0 +1 @@ +../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/strongswan b/config/rootfiles/core/43/filelists/strongswan new file mode 120000 index 0000000..90c727e --- /dev/null +++ b/config/rootfiles/core/43/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/tcl b/config/rootfiles/core/43/filelists/tcl new file mode 120000 index 0000000..7f620c6 --- /dev/null +++ b/config/rootfiles/core/43/filelists/tcl @@ -0,0 +1 @@ +../../../common/tcl \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/udev b/config/rootfiles/core/43/filelists/udev new file mode 120000 index 0000000..e967a1c --- /dev/null +++ b/config/rootfiles/core/43/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/usb_modeswitch b/config/rootfiles/core/43/filelists/usb_modeswitch new file mode 120000 index 0000000..acbab6f --- /dev/null +++ b/config/rootfiles/core/43/filelists/usb_modeswitch @@ -0,0 +1 @@ +../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/usb_modeswitch_data b/config/rootfiles/core/43/filelists/usb_modeswitch_data new file mode 120000 index 0000000..4cbce46 --- /dev/null +++ b/config/rootfiles/core/43/filelists/usb_modeswitch_data @@ -0,0 +1 @@ +../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/wireless b/config/rootfiles/core/43/filelists/wireless new file mode 120000 index 0000000..6cdd0b4 --- /dev/null +++ b/config/rootfiles/core/43/filelists/wireless @@ -0,0 +1 @@ +../../../common/wireless \ No newline at end of file diff --git a/config/rootfiles/core/43/filelists/wpa_supplicant b/config/rootfiles/core/43/filelists/wpa_supplicant new file mode 120000 index 0000000..1d04c03 --- /dev/null +++ b/config/rootfiles/core/43/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/43/update.sh b/config/rootfiles/core/43/update.sh index 6b54995..3c52e01 100644 --- a/config/rootfiles/core/43/update.sh +++ b/config/rootfiles/core/43/update.sh @@ -23,26 +23,181 @@ # . /opt/pakfire/lib/functions.sh /usr/local/bin/backupctrl exclude >/dev/null 2>&1 +# +KVER="2.6.32.26" +MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` +# Nur den letzten Parameter verwenden +echo $MOUNT > /dev/null +MOUNT=$_ +if [ ! $MOUNT == "rw" ]; then + MOUNT="ro" +fi +
# -#Stop services +# check if we the backup file already exist +if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 +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 boot >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.conf >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES +echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES +echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES +echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES +echo usr/bin/iw >> /opt/pakfire/tmp/ROOTFILES
+# Backup the files +tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 + +echo +echo Update Kernel to $KVER ... +# Remove old kernel, configs, initrd, modules ... +# +rm -rf /boot/System.map-* +rm -rf /boot/config-* +rm -rf /boot/ipfirerd-* +rm -rf /boot/vmlinuz-* +rm -rf /lib/modules/*-ipfire +# Remove mkinitcpio +rm -rf /etc/mkinitcpio.* +rm -rf /lib/initcpio +rm -rf /sbin/mkinitcpio +# Remove old iw (new is in usr/sbin) +rm -rf /usr/bin/iw +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org +# +# Unpack the updated files # -#Extract files -extract_files +echo +echo Unpack the updated files ... +# +tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ + --no-overwrite-dir + +# +# Stop services to save memory +# +/etc/init.d/snort stop +/etc/init.d/squid stop
+# Convert /etc/fstab entries to UUID ... +# +echo Convert fstab entries to UUID ... +ROOT=`mount | grep " / " | cut -d" " -f1` +BOOT=`mount | grep " /boot " | cut -d" " -f1` +VAR=`mount | grep " /var " | cut -d" " -f1` +SWAP=`grep "/dev/" /proc/swaps | cut -d" " -f1` # -#Start services
+if [ ! -z $ROOT ]; then + ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` + if [ ! -z $ROOTUUID ]; then + sed -i "s|^$ROOT|UUID=$ROOTUUID|g" /etc/fstab + #else + #to do add uuid to rootfs + fi + else + echo "ERROR! / not found!!!" +fi + +if [ ! -z $BOOT ]; then + BOOTUUID=`blkid -c /dev/null -sUUID $BOOT | cut -d'"' -f2` + if [ ! -z $BOOTUUID ]; then + sed -i "s|^$BOOT|UUID=$BOOTUUID|g" /etc/fstab + #else + #to do add uuid to bootfs + fi + else + echo "WARNING! /boot not found!!!" +fi + +if [ ! -z $VAR ]; then + VARUUID=`blkid -c /dev/null -sUUID $VAR | cut -d'"' -f2` + if [ ! -z $VARUUID ]; then + sed -i "s|^$VAR|UUID=$VARUUID|g" /etc/fstab + #else + #to do add uuid to varfs + fi + else + echo "WARNING! /var not found!!!" +fi + +if [ ! -z $SWAP ]; then + SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` + if [ ! -z $SWAPUUID ]; then + sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab + else + # Reformat swap to add a UUID + swapoff -a + mkswap $SWAP + swapon -a + SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` + if [ ! -z $SWAPUUID ]; then + sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab + fi + fi + else + echo "WARNING! swap not found!!!" +fi + +# +# Start services # -#Update Language cache -#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +/etc/init.d/squid start +/etc/init.d/snort start
-#Rebuild module dep's -#depmod 2.6.32.15-ipfire -#depmod 2.6.32.15-ipfire-xen +# +# Modify grub.conf +# +echo +echo Update grub configuration ... +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,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# Change /dev/hd? to /dev/sda +# +if [ "${ROOT:0:7}" == "/dev/hd" ];then + sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /boot/grub/grub.conf + sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab +fi +# +# ReInstall grub +# +grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck +# +# Rebuild Language +# +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" +# +# Delete old lm-sensor modullist to force search at next boot # -#Finish -#Don't report the exitcode last command -exit 0 +rm -rf /etc/sysconfig/lm_sensors +/usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg" +/usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!" +/usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** " diff --git a/config/rootfiles/core/test/exclude b/config/rootfiles/core/test/exclude deleted file mode 100644 index c2bceb8..0000000 --- a/config/rootfiles/core/test/exclude +++ /dev/null @@ -1,6 +0,0 @@ -etc/udev/rules.d/30-persistent-network.rules -etc/ipsec.conf -etc/ipsec.secrets -etc/ipsec.user.conf -etc/ipsec.user.secrets -var/updatecache diff --git a/config/rootfiles/core/test/filelists/apache2 b/config/rootfiles/core/test/filelists/apache2 deleted file mode 120000 index eef95ef..0000000 --- a/config/rootfiles/core/test/filelists/apache2 +++ /dev/null @@ -1 +0,0 @@ -../../../common/apache2 \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/attr b/config/rootfiles/core/test/filelists/attr deleted file mode 120000 index c808017..0000000 --- a/config/rootfiles/core/test/filelists/attr +++ /dev/null @@ -1 +0,0 @@ -../../../common/attr \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/cpio b/config/rootfiles/core/test/filelists/cpio deleted file mode 120000 index fbab21a..0000000 --- a/config/rootfiles/core/test/filelists/cpio +++ /dev/null @@ -1 +0,0 @@ -../../../common/cpio \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/dnsmasq b/config/rootfiles/core/test/filelists/dnsmasq deleted file mode 120000 index d469c74..0000000 --- a/config/rootfiles/core/test/filelists/dnsmasq +++ /dev/null @@ -1 +0,0 @@ -../../../common/dnsmasq \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/dracut b/config/rootfiles/core/test/filelists/dracut deleted file mode 120000 index 1608699..0000000 --- a/config/rootfiles/core/test/filelists/dracut +++ /dev/null @@ -1 +0,0 @@ -../../../common/dracut \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/files b/config/rootfiles/core/test/filelists/files deleted file mode 100644 index eb3c951..0000000 --- a/config/rootfiles/core/test/filelists/files +++ /dev/null @@ -1,11 +0,0 @@ -etc/system-release -etc/rc.d/init.d/checkfs -etc/rc.d/init.d/checkfstab -etc/rc.d/init.d/squid -srv/web/ipfire/cgi-bin/proxy.cgi -srv/web/ipfire/cgi-bin/speed.cgi -srv/web/ipfire/cgi-bin/vpnmain.cgi -srv/web/ipfire/html/images/urlfilter/copy.gif -var/ipfire/general-functions.pl -usr/local/bin/rebuild-initrd -usr/bin/ldd diff --git a/config/rootfiles/core/test/filelists/findutils b/config/rootfiles/core/test/filelists/findutils deleted file mode 120000 index 545280a..0000000 --- a/config/rootfiles/core/test/filelists/findutils +++ /dev/null @@ -1 +0,0 @@ -../../../common/findutils \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/grub b/config/rootfiles/core/test/filelists/grub deleted file mode 120000 index 050745c..0000000 --- a/config/rootfiles/core/test/filelists/grub +++ /dev/null @@ -1 +0,0 @@ -../../../common/grub \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/iw b/config/rootfiles/core/test/filelists/iw deleted file mode 120000 index 7c58a20..0000000 --- a/config/rootfiles/core/test/filelists/iw +++ /dev/null @@ -1 +0,0 @@ -../../../common/iw \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/libcap b/config/rootfiles/core/test/filelists/libcap deleted file mode 120000 index ed67d95..0000000 --- a/config/rootfiles/core/test/filelists/libcap +++ /dev/null @@ -1 +0,0 @@ -../../../common/libcap \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/linux b/config/rootfiles/core/test/filelists/linux deleted file mode 120000 index c469fe1..0000000 --- a/config/rootfiles/core/test/filelists/linux +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/linux-firmware b/config/rootfiles/core/test/filelists/linux-firmware deleted file mode 120000 index 4bf91bc..0000000 --- a/config/rootfiles/core/test/filelists/linux-firmware +++ /dev/null @@ -1 +0,0 @@ -../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/smartmontools b/config/rootfiles/core/test/filelists/smartmontools deleted file mode 120000 index fb66daf..0000000 --- a/config/rootfiles/core/test/filelists/smartmontools +++ /dev/null @@ -1 +0,0 @@ -../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/squid b/config/rootfiles/core/test/filelists/squid deleted file mode 120000 index 2dc8372..0000000 --- a/config/rootfiles/core/test/filelists/squid +++ /dev/null @@ -1 +0,0 @@ -../../../common/squid \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/strongswan b/config/rootfiles/core/test/filelists/strongswan deleted file mode 120000 index 90c727e..0000000 --- a/config/rootfiles/core/test/filelists/strongswan +++ /dev/null @@ -1 +0,0 @@ -../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/tcl b/config/rootfiles/core/test/filelists/tcl deleted file mode 120000 index 7f620c6..0000000 --- a/config/rootfiles/core/test/filelists/tcl +++ /dev/null @@ -1 +0,0 @@ -../../../common/tcl \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/udev b/config/rootfiles/core/test/filelists/udev deleted file mode 120000 index e967a1c..0000000 --- a/config/rootfiles/core/test/filelists/udev +++ /dev/null @@ -1 +0,0 @@ -../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch b/config/rootfiles/core/test/filelists/usb_modeswitch deleted file mode 120000 index acbab6f..0000000 --- a/config/rootfiles/core/test/filelists/usb_modeswitch +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/usb_modeswitch_data b/config/rootfiles/core/test/filelists/usb_modeswitch_data deleted file mode 120000 index 4cbce46..0000000 --- a/config/rootfiles/core/test/filelists/usb_modeswitch_data +++ /dev/null @@ -1 +0,0 @@ -../../../common/usb_modeswitch_data \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/wireless b/config/rootfiles/core/test/filelists/wireless deleted file mode 120000 index 6cdd0b4..0000000 --- a/config/rootfiles/core/test/filelists/wireless +++ /dev/null @@ -1 +0,0 @@ -../../../common/wireless \ No newline at end of file diff --git a/config/rootfiles/core/test/filelists/wpa_supplicant b/config/rootfiles/core/test/filelists/wpa_supplicant deleted file mode 120000 index 1d04c03..0000000 --- a/config/rootfiles/core/test/filelists/wpa_supplicant +++ /dev/null @@ -1 +0,0 @@ -../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/test/meta b/config/rootfiles/core/test/meta deleted file mode 100644 index d547fa8..0000000 --- a/config/rootfiles/core/test/meta +++ /dev/null @@ -1 +0,0 @@ -DEPS="" diff --git a/config/rootfiles/core/test/update.sh b/config/rootfiles/core/test/update.sh deleted file mode 100644 index 3c52e01..0000000 --- a/config/rootfiles/core/test/update.sh +++ /dev/null @@ -1,203 +0,0 @@ -#!/bin/bash -############################################################################ -# # -# This file is part of the IPFire Firewall. # -# # -# IPFire is free software; you can redistribute it and/or modify # -# it under the terms of the GNU General Public License as published by # -# the Free Software Foundation; either version 3 of the License, or # -# (at your option) any later version. # -# # -# IPFire is distributed in the hope that it will be useful, # -# but WITHOUT ANY WARRANTY; without even the implied warranty of # -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # -# GNU General Public License for more details. # -# # -# You should have received a copy of the GNU General Public License # -# along with IPFire; if not, write to the Free Software # -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # -# # -# Copyright (C) 2010 IPFire-Team info@ipfire.org. # -# # -############################################################################ -# -. /opt/pakfire/lib/functions.sh -/usr/local/bin/backupctrl exclude >/dev/null 2>&1 -# -KVER="2.6.32.26" -MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1` -# Nur den letzten Parameter verwenden -echo $MOUNT > /dev/null -MOUNT=$_ -if [ ! $MOUNT == "rw" ]; then - MOUNT="ro" -fi - - -# -# check if we the backup file already exist -if [ -e /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 ]; then - echo Moving backup to backup-old ... - mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - /var/ipfire/backup/core-upgrade_$KVER-old.tar.bz2 -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 boot >> /opt/pakfire/tmp/ROOTFILES -echo etc/mkinitcpio.conf >> /opt/pakfire/tmp/ROOTFILES -echo etc/mkinitcpio.conf.org >> /opt/pakfire/tmp/ROOTFILES -echo etc/mkinitcpio.d >> /opt/pakfire/tmp/ROOTFILES -echo lib/initcpio >> /opt/pakfire/tmp/ROOTFILES -echo sbin/mkinitcpio >> /opt/pakfire/tmp/ROOTFILES -echo usr/bin/iw >> /opt/pakfire/tmp/ROOTFILES - -# Backup the files -tar cjvf /var/ipfire/backup/core-upgrade_$KVER.tar.bz2 \ - -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' > /dev/null 2>&1 - -echo -echo Update Kernel to $KVER ... -# Remove old kernel, configs, initrd, modules ... -# -rm -rf /boot/System.map-* -rm -rf /boot/config-* -rm -rf /boot/ipfirerd-* -rm -rf /boot/vmlinuz-* -rm -rf /lib/modules/*-ipfire -# Remove mkinitcpio -rm -rf /etc/mkinitcpio.* -rm -rf /lib/initcpio -rm -rf /sbin/mkinitcpio -# Remove old iw (new is in usr/sbin) -rm -rf /usr/bin/iw -# -# Backup grub.conf -# -cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org -# -# Unpack the updated files -# -echo -echo Unpack the updated files ... -# -tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \ - --no-overwrite-dir - -# -# Stop services to save memory -# -/etc/init.d/snort stop -/etc/init.d/squid stop - -# Convert /etc/fstab entries to UUID ... -# -echo Convert fstab entries to UUID ... -ROOT=`mount | grep " / " | cut -d" " -f1` -BOOT=`mount | grep " /boot " | cut -d" " -f1` -VAR=`mount | grep " /var " | cut -d" " -f1` -SWAP=`grep "/dev/" /proc/swaps | cut -d" " -f1` -# - -if [ ! -z $ROOT ]; then - ROOTUUID=`blkid -c /dev/null -sUUID $ROOT | cut -d'"' -f2` - if [ ! -z $ROOTUUID ]; then - sed -i "s|^$ROOT|UUID=$ROOTUUID|g" /etc/fstab - #else - #to do add uuid to rootfs - fi - else - echo "ERROR! / not found!!!" -fi - -if [ ! -z $BOOT ]; then - BOOTUUID=`blkid -c /dev/null -sUUID $BOOT | cut -d'"' -f2` - if [ ! -z $BOOTUUID ]; then - sed -i "s|^$BOOT|UUID=$BOOTUUID|g" /etc/fstab - #else - #to do add uuid to bootfs - fi - else - echo "WARNING! /boot not found!!!" -fi - -if [ ! -z $VAR ]; then - VARUUID=`blkid -c /dev/null -sUUID $VAR | cut -d'"' -f2` - if [ ! -z $VARUUID ]; then - sed -i "s|^$VAR|UUID=$VARUUID|g" /etc/fstab - #else - #to do add uuid to varfs - fi - else - echo "WARNING! /var not found!!!" -fi - -if [ ! -z $SWAP ]; then - SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` - if [ ! -z $SWAPUUID ]; then - sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab - else - # Reformat swap to add a UUID - swapoff -a - mkswap $SWAP - swapon -a - SWAPUUID=`blkid -c /dev/null -sUUID $SWAP | cut -d'"' -f2` - if [ ! -z $SWAPUUID ]; then - sed -i "s|^$SWAP|UUID=$SWAPUUID|g" /etc/fstab - fi - fi - else - echo "WARNING! swap not found!!!" -fi - -# -# Start services -# -/etc/init.d/squid start -/etc/init.d/snort start - -# -# Modify grub.conf -# -echo -echo Update grub configuration ... -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,38400n8 panic=10 |g" /boot/grub/grub.conf -fi -# -# Change /dev/hd? to /dev/sda -# -if [ "${ROOT:0:7}" == "/dev/hd" ];then - sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /boot/grub/grub.conf - sed -i -e "s|${ROOT:0:8}|/dev/sda|g" /etc/fstab -fi -# -# ReInstall grub -# -grub-install --no-floppy ${ROOT::`expr length $ROOT`-1} --recheck -# -# Rebuild Language -# -perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" -# -# Delete old lm-sensor modullist to force search at next boot -# -rm -rf /etc/sysconfig/lm_sensors -/usr/bin/logger -p syslog.emerg -t kernel "Upgrade finished. If you use a customized grub.cfg" -/usr/bin/logger -p syslog.emerg -t kernel "Check it before reboot !!!" -/usr/bin/logger -p syslog.emerg -t kernel " *** Please reboot... *** "
hooks/post-receive -- IPFire 2.x development tree
-
git＠ipfire.org