From: Arne Fitzenreiter Date: Tue, 6 Nov 2012 22:59:30 +0000 (+0100) Subject: started updater from 2.11 to 2.13. X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=f0a4269bfee8bce9904abe62144bc377ca7aab14 started updater from 2.11 to 2.13. --- diff --git a/config/rootfiles/core/65/exclude b/config/rootfiles/core/65/exclude new file mode 100644 index 000000000..0b54d0506 --- /dev/null +++ b/config/rootfiles/core/65/exclude @@ -0,0 +1,15 @@ +srv/web/ipfire/html/proxy.pac +etc/udev/rules.d/30-persistent-network.rules +etc/collectd.custom +etc/shadow +etc/ipsec.conf +etc/ipsec.secrets +etc/ipsec.user.conf +etc/ipsec.user.secrets +var/updatecache +etc/localtime +var/ipfire/ovpn +etc/ssh/ssh_config +etc/ssh/sshd_config +etc/ssl/openssl.cnf +var/state/dhcp/dhcpd.leases diff --git a/config/rootfiles/core/65/filelists/armv5tel/binutils b/config/rootfiles/core/65/filelists/armv5tel/binutils new file mode 120000 index 000000000..ac971f931 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/binutils @@ -0,0 +1 @@ +../../../../common/armv5tel/binutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/dracut b/config/rootfiles/core/65/filelists/armv5tel/dracut new file mode 120000 index 000000000..861df3f36 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/dracut @@ -0,0 +1 @@ +../../../../common/armv5tel/dracut \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/gcc b/config/rootfiles/core/65/filelists/armv5tel/gcc new file mode 120000 index 000000000..84f7b9344 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/gcc @@ -0,0 +1 @@ +../../../../common/armv5tel/gcc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/glibc b/config/rootfiles/core/65/filelists/armv5tel/glibc new file mode 120000 index 000000000..4c70d724b --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/glibc @@ -0,0 +1 @@ +../../../../common/armv5tel/glibc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood b/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood new file mode 120000 index 000000000..72171071e --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/linux-kirkwood @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-kirkwood \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-omap b/config/rootfiles/core/65/filelists/armv5tel/linux-omap new file mode 120000 index 000000000..50bf78651 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/linux-omap @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-omap \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/linux-rpi b/config/rootfiles/core/65/filelists/armv5tel/linux-rpi new file mode 120000 index 000000000..a651a498f --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/linux-rpi @@ -0,0 +1 @@ +../../../../common/armv5tel/linux-rpi \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware b/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware new file mode 120000 index 000000000..428fdf88f --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/rpi-firmware @@ -0,0 +1 @@ +../../../../common/armv5tel/rpi-firmware \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/u-boot b/config/rootfiles/core/65/filelists/armv5tel/u-boot new file mode 120000 index 000000000..3df31a883 --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/u-boot @@ -0,0 +1 @@ +../../../../common/armv5tel/u-boot \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/armv5tel/util-linux b/config/rootfiles/core/65/filelists/armv5tel/util-linux new file mode 120000 index 000000000..2596908cc --- /dev/null +++ b/config/rootfiles/core/65/filelists/armv5tel/util-linux @@ -0,0 +1 @@ +../../../../common/armv5tel/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/autoconf b/config/rootfiles/core/65/filelists/autoconf new file mode 120000 index 000000000..aa39ce671 --- /dev/null +++ b/config/rootfiles/core/65/filelists/autoconf @@ -0,0 +1 @@ +../../../common/autoconf \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/automake b/config/rootfiles/core/65/filelists/automake new file mode 120000 index 000000000..df3ee421c --- /dev/null +++ b/config/rootfiles/core/65/filelists/automake @@ -0,0 +1 @@ +../../../common/automake \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/bash b/config/rootfiles/core/65/filelists/bash new file mode 120000 index 000000000..de970cb1d --- /dev/null +++ b/config/rootfiles/core/65/filelists/bash @@ -0,0 +1 @@ +../../../common/bash \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cairo b/config/rootfiles/core/65/filelists/cairo new file mode 120000 index 000000000..bf48d25a4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/cairo @@ -0,0 +1 @@ +../../../common/cairo \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/capi4k-utils b/config/rootfiles/core/65/filelists/capi4k-utils new file mode 120000 index 000000000..82982c4b9 --- /dev/null +++ b/config/rootfiles/core/65/filelists/capi4k-utils @@ -0,0 +1 @@ +../../../common/capi4k-utils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cmake b/config/rootfiles/core/65/filelists/cmake new file mode 120000 index 000000000..491d25f72 --- /dev/null +++ b/config/rootfiles/core/65/filelists/cmake @@ -0,0 +1 @@ +../../../common/cmake \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/collectd b/config/rootfiles/core/65/filelists/collectd new file mode 120000 index 000000000..871b32f14 --- /dev/null +++ b/config/rootfiles/core/65/filelists/collectd @@ -0,0 +1 @@ +../../../common/collectd \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/compat-wireless b/config/rootfiles/core/65/filelists/compat-wireless new file mode 120000 index 000000000..5b5ac9ee4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/compat-wireless @@ -0,0 +1 @@ +../../../common/compat-wireless \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/coreutils b/config/rootfiles/core/65/filelists/coreutils new file mode 120000 index 000000000..7351ed2cf --- /dev/null +++ b/config/rootfiles/core/65/filelists/coreutils @@ -0,0 +1 @@ +../../../common/coreutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/curl b/config/rootfiles/core/65/filelists/curl new file mode 120000 index 000000000..4b84bef53 --- /dev/null +++ b/config/rootfiles/core/65/filelists/curl @@ -0,0 +1 @@ +../../../common/curl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/cyrus-sasl b/config/rootfiles/core/65/filelists/cyrus-sasl new file mode 120000 index 000000000..bb51b4c92 --- /dev/null +++ b/config/rootfiles/core/65/filelists/cyrus-sasl @@ -0,0 +1 @@ +../../../common/cyrus-sasl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/daq b/config/rootfiles/core/65/filelists/daq new file mode 120000 index 000000000..d0e0956f2 --- /dev/null +++ b/config/rootfiles/core/65/filelists/daq @@ -0,0 +1 @@ +../../../common/daq \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dejavu-fonts-ttf b/config/rootfiles/core/65/filelists/dejavu-fonts-ttf new file mode 120000 index 000000000..0007a8b24 --- /dev/null +++ b/config/rootfiles/core/65/filelists/dejavu-fonts-ttf @@ -0,0 +1 @@ +../../../common/dejavu-fonts-ttf \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dhcp b/config/rootfiles/core/65/filelists/dhcp new file mode 120000 index 000000000..32d8da443 --- /dev/null +++ b/config/rootfiles/core/65/filelists/dhcp @@ -0,0 +1 @@ +../../../common/dhcp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/dvb-firmwares b/config/rootfiles/core/65/filelists/dvb-firmwares new file mode 120000 index 000000000..69d0cdcfa --- /dev/null +++ b/config/rootfiles/core/65/filelists/dvb-firmwares @@ -0,0 +1 @@ +../../../common/dvb-firmwares \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/e2fsprogs b/config/rootfiles/core/65/filelists/e2fsprogs new file mode 120000 index 000000000..37b55de69 --- /dev/null +++ b/config/rootfiles/core/65/filelists/e2fsprogs @@ -0,0 +1 @@ +../../../common/e2fsprogs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/file b/config/rootfiles/core/65/filelists/file new file mode 120000 index 000000000..0c60e43aa --- /dev/null +++ b/config/rootfiles/core/65/filelists/file @@ -0,0 +1 @@ +../../../common/file \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files new file mode 100644 index 000000000..6d0030e78 --- /dev/null +++ b/config/rootfiles/core/65/filelists/files @@ -0,0 +1,20 @@ +etc/system-release +etc/issue +etc/sysctl.conf +etc/securetty +opt/pakfire/etc/pakfire.conf +etc/rc.d/init.d/partresize +etc/rc.d/init.d/fsresize +etc/rc.d/init.d/setclock +etc/rc.d/init.d/tmpfs +etc/rc.d/rc0.d/K47setclock +etc/rc.d/rc6.d/K47setclock +srv/web/ipfire/cgi-bin/credits.cgi +srv/web/ipfire/cgi-bin/ids.cgi +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 diff --git a/config/rootfiles/core/65/filelists/fontconfig b/config/rootfiles/core/65/filelists/fontconfig new file mode 120000 index 000000000..6daeffdd0 --- /dev/null +++ b/config/rootfiles/core/65/filelists/fontconfig @@ -0,0 +1 @@ +../../../common/fontconfig \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gawk b/config/rootfiles/core/65/filelists/gawk new file mode 120000 index 000000000..a3bbe32ce --- /dev/null +++ b/config/rootfiles/core/65/filelists/gawk @@ -0,0 +1 @@ +../../../common/gawk \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gettext b/config/rootfiles/core/65/filelists/gettext new file mode 120000 index 000000000..b6c6c6f4f --- /dev/null +++ b/config/rootfiles/core/65/filelists/gettext @@ -0,0 +1 @@ +../../../common/gettext \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/glib b/config/rootfiles/core/65/filelists/glib new file mode 120000 index 000000000..44665746a --- /dev/null +++ b/config/rootfiles/core/65/filelists/glib @@ -0,0 +1 @@ +../../../common/glib \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gmp b/config/rootfiles/core/65/filelists/gmp new file mode 120000 index 000000000..8662a8982 --- /dev/null +++ b/config/rootfiles/core/65/filelists/gmp @@ -0,0 +1 @@ +../../../common/gmp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gmp-compat b/config/rootfiles/core/65/filelists/gmp-compat new file mode 120000 index 000000000..10093cdd7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/gmp-compat @@ -0,0 +1 @@ +../../../common/gmp-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/gnupg b/config/rootfiles/core/65/filelists/gnupg new file mode 120000 index 000000000..a1a156447 --- /dev/null +++ b/config/rootfiles/core/65/filelists/gnupg @@ -0,0 +1 @@ +../../../common/gnupg \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/grep b/config/rootfiles/core/65/filelists/grep new file mode 120000 index 000000000..ab5ef8b0e --- /dev/null +++ b/config/rootfiles/core/65/filelists/grep @@ -0,0 +1 @@ +../../../common/grep \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/hdparm b/config/rootfiles/core/65/filelists/hdparm new file mode 120000 index 000000000..b6447518a --- /dev/null +++ b/config/rootfiles/core/65/filelists/hdparm @@ -0,0 +1 @@ +../../../common/hdparm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/acpid b/config/rootfiles/core/65/filelists/i586/acpid new file mode 120000 index 000000000..21d36ee1d --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/acpid @@ -0,0 +1 @@ +../../../../common/i586/acpid \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/binutils b/config/rootfiles/core/65/filelists/i586/binutils new file mode 120000 index 000000000..78695d73a --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/binutils @@ -0,0 +1 @@ +../../../../common/i586/binutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/dracut b/config/rootfiles/core/65/filelists/i586/dracut new file mode 120000 index 000000000..9a0901051 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/dracut @@ -0,0 +1 @@ +../../../../common/i586/dracut \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/gcc b/config/rootfiles/core/65/filelists/i586/gcc new file mode 120000 index 000000000..ba328e3b6 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/gcc @@ -0,0 +1 @@ +../../../../common/i586/gcc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/glibc b/config/rootfiles/core/65/filelists/i586/glibc new file mode 120000 index 000000000..943021f19 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/glibc @@ -0,0 +1 @@ +../../../../common/i586/glibc \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/grub b/config/rootfiles/core/65/filelists/i586/grub new file mode 100644 index 000000000..1fc2d19d4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/grub @@ -0,0 +1,2 @@ +#boot/grub +boot/grub/grub.conf diff --git a/config/rootfiles/core/65/filelists/i586/linux b/config/rootfiles/core/65/filelists/i586/linux new file mode 120000 index 000000000..693ec4bbf --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/linux @@ -0,0 +1 @@ +../../../../common/i586/linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/strongswan-padlock b/config/rootfiles/core/65/filelists/i586/strongswan-padlock new file mode 120000 index 000000000..2412824fb --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/strongswan-padlock @@ -0,0 +1 @@ +../../../../common/i586/strongswan-padlock \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/i586/util-linux b/config/rootfiles/core/65/filelists/i586/util-linux new file mode 120000 index 000000000..c973106f1 --- /dev/null +++ b/config/rootfiles/core/65/filelists/i586/util-linux @@ -0,0 +1 @@ +../../../../common/i586/util-linux \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/inetutils b/config/rootfiles/core/65/filelists/inetutils new file mode 120000 index 000000000..bcd329b8a --- /dev/null +++ b/config/rootfiles/core/65/filelists/inetutils @@ -0,0 +1 @@ +../../../common/inetutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/iproute2 b/config/rootfiles/core/65/filelists/iproute2 new file mode 120000 index 000000000..05f0f71fb --- /dev/null +++ b/config/rootfiles/core/65/filelists/iproute2 @@ -0,0 +1 @@ +../../../common/iproute2 \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/iptables b/config/rootfiles/core/65/filelists/iptables new file mode 120000 index 000000000..8caf12bcc --- /dev/null +++ b/config/rootfiles/core/65/filelists/iptables @@ -0,0 +1 @@ +../../../common/iptables \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/kbd b/config/rootfiles/core/65/filelists/kbd new file mode 120000 index 000000000..9b85839b1 --- /dev/null +++ b/config/rootfiles/core/65/filelists/kbd @@ -0,0 +1 @@ +../../../common/kbd \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/less b/config/rootfiles/core/65/filelists/less new file mode 120000 index 000000000..65c0e0771 --- /dev/null +++ b/config/rootfiles/core/65/filelists/less @@ -0,0 +1 @@ +../../../common/less \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libffi b/config/rootfiles/core/65/filelists/libffi new file mode 120000 index 000000000..c391acd0c --- /dev/null +++ b/config/rootfiles/core/65/filelists/libffi @@ -0,0 +1 @@ +../../../common/libffi \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libnl b/config/rootfiles/core/65/filelists/libnl new file mode 120000 index 000000000..7181849de --- /dev/null +++ b/config/rootfiles/core/65/filelists/libnl @@ -0,0 +1 @@ +../../../common/libnl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libsigc++ b/config/rootfiles/core/65/filelists/libsigc++ new file mode 120000 index 000000000..51f4c756f --- /dev/null +++ b/config/rootfiles/core/65/filelists/libsigc++ @@ -0,0 +1 @@ +../../../common/libsigc++ \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/libtool b/config/rootfiles/core/65/filelists/libtool new file mode 120000 index 000000000..54f5666f8 --- /dev/null +++ b/config/rootfiles/core/65/filelists/libtool @@ -0,0 +1 @@ +../../../common/libtool \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/linux-atm b/config/rootfiles/core/65/filelists/linux-atm new file mode 120000 index 000000000..8adccafbd --- /dev/null +++ b/config/rootfiles/core/65/filelists/linux-atm @@ -0,0 +1 @@ +../../../common/linux-atm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/linux-firmware b/config/rootfiles/core/65/filelists/linux-firmware new file mode 120000 index 000000000..4bf91bca9 --- /dev/null +++ b/config/rootfiles/core/65/filelists/linux-firmware @@ -0,0 +1 @@ +../../../common/linux-firmware \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/m4 b/config/rootfiles/core/65/filelists/m4 new file mode 120000 index 000000000..3f009cc69 --- /dev/null +++ b/config/rootfiles/core/65/filelists/m4 @@ -0,0 +1 @@ +../../../common/m4 \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/mISDNuser b/config/rootfiles/core/65/filelists/mISDNuser new file mode 120000 index 000000000..78537d4c9 --- /dev/null +++ b/config/rootfiles/core/65/filelists/mISDNuser @@ -0,0 +1 @@ +../../../common/mISDNuser \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/man b/config/rootfiles/core/65/filelists/man new file mode 120000 index 000000000..b04d65c44 --- /dev/null +++ b/config/rootfiles/core/65/filelists/man @@ -0,0 +1 @@ +../../../common/man \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/misc-progs b/config/rootfiles/core/65/filelists/misc-progs new file mode 120000 index 000000000..7223caddd --- /dev/null +++ b/config/rootfiles/core/65/filelists/misc-progs @@ -0,0 +1 @@ +../../../common/misc-progs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/mpfr b/config/rootfiles/core/65/filelists/mpfr new file mode 120000 index 000000000..c8468bf42 --- /dev/null +++ b/config/rootfiles/core/65/filelists/mpfr @@ -0,0 +1 @@ +../../../common/mpfr \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/ncurses b/config/rootfiles/core/65/filelists/ncurses new file mode 120000 index 000000000..512faef6a --- /dev/null +++ b/config/rootfiles/core/65/filelists/ncurses @@ -0,0 +1 @@ +../../../common/ncurses \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/newt b/config/rootfiles/core/65/filelists/newt new file mode 120000 index 000000000..fb3eb20c3 --- /dev/null +++ b/config/rootfiles/core/65/filelists/newt @@ -0,0 +1 @@ +../../../common/newt \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/openldap b/config/rootfiles/core/65/filelists/openldap new file mode 120000 index 000000000..80c324f76 --- /dev/null +++ b/config/rootfiles/core/65/filelists/openldap @@ -0,0 +1 @@ +../../../common/openldap \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/openssl b/config/rootfiles/core/65/filelists/openssl new file mode 120000 index 000000000..e011a9266 --- /dev/null +++ b/config/rootfiles/core/65/filelists/openssl @@ -0,0 +1 @@ +../../../common/openssl \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pam b/config/rootfiles/core/65/filelists/pam new file mode 120000 index 000000000..660a1d80e --- /dev/null +++ b/config/rootfiles/core/65/filelists/pam @@ -0,0 +1 @@ +../../../common/pam \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pango b/config/rootfiles/core/65/filelists/pango new file mode 120000 index 000000000..6c37231c7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pango @@ -0,0 +1 @@ +../../../common/pango \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pciutils b/config/rootfiles/core/65/filelists/pciutils new file mode 120000 index 000000000..aeb45e7b3 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pciutils @@ -0,0 +1 @@ +../../../common/pciutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcmciautils b/config/rootfiles/core/65/filelists/pcmciautils new file mode 120000 index 000000000..7cbf8218c --- /dev/null +++ b/config/rootfiles/core/65/filelists/pcmciautils @@ -0,0 +1 @@ +../../../common/pcmciautils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcre b/config/rootfiles/core/65/filelists/pcre new file mode 120000 index 000000000..b390d9a36 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pcre @@ -0,0 +1 @@ +../../../common/pcre \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pcre-compat b/config/rootfiles/core/65/filelists/pcre-compat new file mode 120000 index 000000000..eff8a7d8b --- /dev/null +++ b/config/rootfiles/core/65/filelists/pcre-compat @@ -0,0 +1 @@ +../../../common/pcre-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pixman b/config/rootfiles/core/65/filelists/pixman new file mode 120000 index 000000000..fdb6346ae --- /dev/null +++ b/config/rootfiles/core/65/filelists/pixman @@ -0,0 +1 @@ +../../../common/pixman \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/popt b/config/rootfiles/core/65/filelists/popt new file mode 120000 index 000000000..d71a9ab04 --- /dev/null +++ b/config/rootfiles/core/65/filelists/popt @@ -0,0 +1 @@ +../../../common/popt \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/pptp b/config/rootfiles/core/65/filelists/pptp new file mode 120000 index 000000000..2b3dfadc0 --- /dev/null +++ b/config/rootfiles/core/65/filelists/pptp @@ -0,0 +1 @@ +../../../common/pptp \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/readline b/config/rootfiles/core/65/filelists/readline new file mode 120000 index 000000000..84209f189 --- /dev/null +++ b/config/rootfiles/core/65/filelists/readline @@ -0,0 +1 @@ +../../../common/readline \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/readline-compat b/config/rootfiles/core/65/filelists/readline-compat new file mode 120000 index 000000000..f96bc808c --- /dev/null +++ b/config/rootfiles/core/65/filelists/readline-compat @@ -0,0 +1 @@ +../../../common/readline-compat \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/reiserfsprogs b/config/rootfiles/core/65/filelists/reiserfsprogs new file mode 120000 index 000000000..008c3e891 --- /dev/null +++ b/config/rootfiles/core/65/filelists/reiserfsprogs @@ -0,0 +1 @@ +../../../common/reiserfsprogs \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/rrdtool b/config/rootfiles/core/65/filelists/rrdtool new file mode 120000 index 000000000..7a82e414b --- /dev/null +++ b/config/rootfiles/core/65/filelists/rrdtool @@ -0,0 +1 @@ +../../../common/rrdtool \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/screen b/config/rootfiles/core/65/filelists/screen new file mode 120000 index 000000000..81008f46e --- /dev/null +++ b/config/rootfiles/core/65/filelists/screen @@ -0,0 +1 @@ +../../../common/screen \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sdparm b/config/rootfiles/core/65/filelists/sdparm new file mode 120000 index 000000000..86d9c247f --- /dev/null +++ b/config/rootfiles/core/65/filelists/sdparm @@ -0,0 +1 @@ +../../../common/sdparm \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sed b/config/rootfiles/core/65/filelists/sed new file mode 120000 index 000000000..fc5f5c6d6 --- /dev/null +++ b/config/rootfiles/core/65/filelists/sed @@ -0,0 +1 @@ +../../../common/sed \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/shadow b/config/rootfiles/core/65/filelists/shadow new file mode 120000 index 000000000..c0824b7b9 --- /dev/null +++ b/config/rootfiles/core/65/filelists/shadow @@ -0,0 +1 @@ +../../../common/shadow \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/slang b/config/rootfiles/core/65/filelists/slang new file mode 120000 index 000000000..228e45ed4 --- /dev/null +++ b/config/rootfiles/core/65/filelists/slang @@ -0,0 +1 @@ +../../../common/slang \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/smartmontools b/config/rootfiles/core/65/filelists/smartmontools new file mode 120000 index 000000000..fb66dafef --- /dev/null +++ b/config/rootfiles/core/65/filelists/smartmontools @@ -0,0 +1 @@ +../../../common/smartmontools \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/snort b/config/rootfiles/core/65/filelists/snort new file mode 120000 index 000000000..9406ce01c --- /dev/null +++ b/config/rootfiles/core/65/filelists/snort @@ -0,0 +1 @@ +../../../common/snort \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/strongswan b/config/rootfiles/core/65/filelists/strongswan new file mode 120000 index 000000000..90c727e26 --- /dev/null +++ b/config/rootfiles/core/65/filelists/strongswan @@ -0,0 +1 @@ +../../../common/strongswan \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sysfsutils b/config/rootfiles/core/65/filelists/sysfsutils new file mode 120000 index 000000000..8f3ee3e86 --- /dev/null +++ b/config/rootfiles/core/65/filelists/sysfsutils @@ -0,0 +1 @@ +../../../common/sysfsutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/sysvinit b/config/rootfiles/core/65/filelists/sysvinit new file mode 120000 index 000000000..f3fb3304d --- /dev/null +++ b/config/rootfiles/core/65/filelists/sysvinit @@ -0,0 +1 @@ +../../../common/sysvinit \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/texinfo b/config/rootfiles/core/65/filelists/texinfo new file mode 120000 index 000000000..fa9df0257 --- /dev/null +++ b/config/rootfiles/core/65/filelists/texinfo @@ -0,0 +1 @@ +../../../common/texinfo \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/tzdata b/config/rootfiles/core/65/filelists/tzdata new file mode 120000 index 000000000..5a6e3252f --- /dev/null +++ b/config/rootfiles/core/65/filelists/tzdata @@ -0,0 +1 @@ +../../../common/tzdata \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/udev b/config/rootfiles/core/65/filelists/udev new file mode 120000 index 000000000..e967a1c92 --- /dev/null +++ b/config/rootfiles/core/65/filelists/udev @@ -0,0 +1 @@ +../../../common/udev \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/usbutils b/config/rootfiles/core/65/filelists/usbutils new file mode 120000 index 000000000..31db5a7ac --- /dev/null +++ b/config/rootfiles/core/65/filelists/usbutils @@ -0,0 +1 @@ +../../../common/usbutils \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/wget b/config/rootfiles/core/65/filelists/wget new file mode 120000 index 000000000..fcb57dfec --- /dev/null +++ b/config/rootfiles/core/65/filelists/wget @@ -0,0 +1 @@ +../../../common/wget \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/wpa_supplicant b/config/rootfiles/core/65/filelists/wpa_supplicant new file mode 120000 index 000000000..1d04c03c0 --- /dev/null +++ b/config/rootfiles/core/65/filelists/wpa_supplicant @@ -0,0 +1 @@ +../../../common/wpa_supplicant \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/xz b/config/rootfiles/core/65/filelists/xz new file mode 120000 index 000000000..734e926c7 --- /dev/null +++ b/config/rootfiles/core/65/filelists/xz @@ -0,0 +1 @@ +../../../common/xz \ No newline at end of file diff --git a/config/rootfiles/core/65/filelists/zlib b/config/rootfiles/core/65/filelists/zlib new file mode 120000 index 000000000..e34566322 --- /dev/null +++ b/config/rootfiles/core/65/filelists/zlib @@ -0,0 +1 @@ +../../../common/zlib \ No newline at end of file diff --git a/config/rootfiles/core/65/meta b/config/rootfiles/core/65/meta new file mode 100644 index 000000000..d547fa86f --- /dev/null +++ b/config/rootfiles/core/65/meta @@ -0,0 +1 @@ +DEPS="" diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh new file mode 100644 index 000000000..6335e1dda --- /dev/null +++ b/config/rootfiles/core/65/update.sh @@ -0,0 +1,201 @@ +#!/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) 2012 IPFire-Team . # +# # +############################################################################ +# +. /opt/pakfire/lib/functions.sh +/usr/local/bin/backupctrl exclude >/dev/null 2>&1 + +# +# Remove old core updates from pakfire cache to save space... +core=65 +for (( i=1; i<=$core; i++ )) +do + rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire +done + +# +KVER="3.2.33" +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.xz ]; then + echo Moving backup to backup-old ... + mv -f /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ + /var/ipfire/backup/core-upgrade_$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 +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 + +# Backup the files +tar cJvf /var/ipfire/backup/core-upgrade_$KVER.tar.xz \ + -C / -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' --exclude='/var/cache' > /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 old udev rules. +# +cp /etc/udev/rules.d/29-ct-server-network.rules /tmp/ +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/ +mv /tmp/30-persistent-network.rules /etc/udev/rules.d/ + +# +# Backup grub.conf +# +cp -vf /boot/grub/grub.conf /boot/grub/grub.conf.org + +# +#Stop services +/etc/init.d/snort stop +/etc/init.d/squid stop +/etc/init.d/ipsec stop + +#Remove old snort +rm -rf /etc/snort +rm -rf /usr/lib/snort_* + +# +#Extract files +extract_files + +# +# Start services +# +/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 + +# +# Rebuild qosscript if enabled +# +if [ -e /var/ipfire/qos/enable ]; then + /usr/local/bin/qosctrl stop + /usr/local/bin/qosctrl generate + /usr/local/bin/qosctrl start +fi + +# +# 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,38400n8 panic=10 |g" /boot/grub/grub.conf +fi +# +# Delete old lm-sensor modullist to force search at next boot +# +rm -rf /etc/sysconfig/lm_sensors + +# +#Update Language cache +perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang" + +# +# Remove meta's of packages that are now common... +# +rm -rf /opt/pakfire/db/*/meta-fontconfig +rm -rf /opt/pakfire/db/*/meta-glib + +# +# 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 core-upgrade-65 "Upgrade finished. If you use a customized grub.cfg"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 "Check it before reboot !!!"' >> /tmp/pak_update +echo '/usr/bin/logger -p syslog.emerg -t core-upgrade-65 " *** Please reboot... *** "' >> /tmp/pak_update +echo 'touch /var/run/need_reboot ' >> /tmp/pak_update +# +chmod +x /tmp/pak_update +/tmp/pak_update & + +sync + +# +#Finish +/etc/init.d/fireinfo start +sendprofile + +echo +echo Please wait until pakfire has ended... +echo +#Don't report the exitcode last command +exit 0 +