Cleanup: remove 2.1 to 2.3 updater
authorArne Fitzenreiter <arne_f@ipfire.org>
Thu, 30 Apr 2009 23:24:09 +0000 (01:24 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Thu, 30 Apr 2009 23:24:09 +0000 (01:24 +0200)
34 files changed:
config/rootfiles/updater/filelists/apache2 [deleted symlink]
config/rootfiles/updater/filelists/bzip2 [deleted symlink]
config/rootfiles/updater/filelists/collectd [deleted symlink]
config/rootfiles/updater/filelists/dnsmasq [deleted symlink]
config/rootfiles/updater/filelists/fbset [deleted symlink]
config/rootfiles/updater/filelists/files [deleted file]
config/rootfiles/updater/filelists/grub [deleted symlink]
config/rootfiles/updater/filelists/hwdata [deleted symlink]
config/rootfiles/updater/filelists/iptables [deleted symlink]
config/rootfiles/updater/filelists/klibc [deleted symlink]
config/rootfiles/updater/filelists/kudzu [deleted symlink]
config/rootfiles/updater/filelists/l7-protocols [deleted symlink]
config/rootfiles/updater/filelists/linux [deleted symlink]
config/rootfiles/updater/filelists/lm_sensors [deleted symlink]
config/rootfiles/updater/filelists/mISDN [deleted symlink]
config/rootfiles/updater/filelists/madwifi [deleted symlink]
config/rootfiles/updater/filelists/mkinitcpio [deleted symlink]
config/rootfiles/updater/filelists/module-init-tools [deleted symlink]
config/rootfiles/updater/filelists/openssh [deleted symlink]
config/rootfiles/updater/filelists/openssl [deleted symlink]
config/rootfiles/updater/filelists/openswan [deleted symlink]
config/rootfiles/updater/filelists/pcmciautils [deleted symlink]
config/rootfiles/updater/filelists/pcre [deleted symlink]
config/rootfiles/updater/filelists/setup [deleted symlink]
config/rootfiles/updater/filelists/snort [deleted symlink]
config/rootfiles/updater/filelists/squid [deleted symlink]
config/rootfiles/updater/filelists/vnstat [deleted symlink]
config/rootfiles/updater/filelists/vnstati [deleted symlink]
config/rootfiles/updater/filelists/wireless [deleted symlink]
config/rootfiles/updater/filelists/wpa_supplicant [deleted symlink]
config/rootfiles/updater/meta [deleted file]
config/rootfiles/updater/update.sh [deleted file]
lfs/updater [deleted file]
make.sh

diff --git a/config/rootfiles/updater/filelists/apache2 b/config/rootfiles/updater/filelists/apache2
deleted file mode 120000 (symlink)
index 5b7dd8d..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/apache2
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/bzip2 b/config/rootfiles/updater/filelists/bzip2
deleted file mode 120000 (symlink)
index 07426a2..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/bzip2
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/collectd b/config/rootfiles/updater/filelists/collectd
deleted file mode 120000 (symlink)
index 48f6bb3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/collectd
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/dnsmasq b/config/rootfiles/updater/filelists/dnsmasq
deleted file mode 120000 (symlink)
index c57eb28..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/dnsmasq
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/fbset b/config/rootfiles/updater/filelists/fbset
deleted file mode 120000 (symlink)
index 77b8005..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/fbset
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/files b/config/rootfiles/updater/filelists/files
deleted file mode 100644 (file)
index d92d12c..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-opt/pakfire/db/core/mine
-etc/logrotate.conf
-etc/rc.d/init.d/mISDN
-etc/modprobe.d/blacklist
-usr/bin/bc
-usr/bin/dc
-etc/ppp/dialer
-etc/rc.d/init.d/checkfstab
-etc/rc.d/rcsysinit.d/S19checkfstab
-etc/rc.d/init.d/dhcp
-etc/rc.d/init.d/tmpfs
-etc/rc.d/rc0.d/K85tmpfs
-etc/rc.d/rc3.d/S01tmpfs
-etc/rc.d/rc6.d/K85tmpfs
-etc/rc.d/init.d/dnsmasq
-etc/rc.d/init.d/sysklogd
-etc/rc.d/init.d/network
-etc/rc.d/init.d/networking/any
-etc/rc.d/init.d/networking/red
-etc/rc.d/init.d/networking/red.up/40-ipac
-etc/udev/dvb.sh
-etc/udev/rules.d/10-dvb.rules
-etc/udev/rules.d/55-scsi-cdrom.rules
-etc/linuxigd/gatedesc.xml
-usr/local/bin/getiptstate
-usr/local/bin/makegraphs
-usr/local/bin/hddshutdown
-usr/local/bin/squidctrl
-usr/local/bin/setddns.pl
-var/ipfire/backup/bin/backup.pl
-var/ipfire/sensors/
-var/ipfire/menu.d/20-status.menu
-var/ipfire/graphs.pl
-var/ipfire/firebuild
-var/ipfire/qos/bin/makeqosscripts.pl
-var/ipfire/proxy/advanced/useragents
-srv/web/ipfire/html/images/updbooster/
-var/ipfire/updatexlrator/bin/
-usr/sbin/updxlrator
-var/ipfire/langs
-usr/local/bin/qosd
-usr/local/bin/backupiso
-usr/bin/mkisofs
-usr/bin/cdrecord
diff --git a/config/rootfiles/updater/filelists/grub b/config/rootfiles/updater/filelists/grub
deleted file mode 120000 (symlink)
index 4aa62cd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/grub
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/hwdata b/config/rootfiles/updater/filelists/hwdata
deleted file mode 120000 (symlink)
index ccf12dd..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/hwdata
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/iptables b/config/rootfiles/updater/filelists/iptables
deleted file mode 120000 (symlink)
index d19438e..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/iptables
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/klibc b/config/rootfiles/updater/filelists/klibc
deleted file mode 120000 (symlink)
index a677524..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/klibc
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/kudzu b/config/rootfiles/updater/filelists/kudzu
deleted file mode 120000 (symlink)
index 299513f..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/kudzu
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/l7-protocols b/config/rootfiles/updater/filelists/l7-protocols
deleted file mode 120000 (symlink)
index d94b803..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/l7-protocols
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/linux b/config/rootfiles/updater/filelists/linux
deleted file mode 120000 (symlink)
index ff7e506..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/linux
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/lm_sensors b/config/rootfiles/updater/filelists/lm_sensors
deleted file mode 120000 (symlink)
index b943ed4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/lm_sensors
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/mISDN b/config/rootfiles/updater/filelists/mISDN
deleted file mode 120000 (symlink)
index 32e088c..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/mISDN
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/madwifi b/config/rootfiles/updater/filelists/madwifi
deleted file mode 120000 (symlink)
index 29f10ee..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/madwifi
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/mkinitcpio b/config/rootfiles/updater/filelists/mkinitcpio
deleted file mode 120000 (symlink)
index da84b47..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/mkinitcpio
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/module-init-tools b/config/rootfiles/updater/filelists/module-init-tools
deleted file mode 120000 (symlink)
index b78f44a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/module-init-tools
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/openssh b/config/rootfiles/updater/filelists/openssh
deleted file mode 120000 (symlink)
index 01080b6..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/openssh
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/openssl b/config/rootfiles/updater/filelists/openssl
deleted file mode 120000 (symlink)
index b9ef263..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/openssl
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/openswan b/config/rootfiles/updater/filelists/openswan
deleted file mode 120000 (symlink)
index 148e0a3..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/openswan
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/pcmciautils b/config/rootfiles/updater/filelists/pcmciautils
deleted file mode 120000 (symlink)
index c73200a..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/pcmciautils
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/pcre b/config/rootfiles/updater/filelists/pcre
deleted file mode 120000 (symlink)
index 0f64524..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/pcre
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/setup b/config/rootfiles/updater/filelists/setup
deleted file mode 120000 (symlink)
index 63b4449..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/setup
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/snort b/config/rootfiles/updater/filelists/snort
deleted file mode 120000 (symlink)
index 9ce4ccb..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/snort
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/squid b/config/rootfiles/updater/filelists/squid
deleted file mode 120000 (symlink)
index 55392c4..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/squid
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/vnstat b/config/rootfiles/updater/filelists/vnstat
deleted file mode 120000 (symlink)
index a186635..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/vnstat
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/vnstati b/config/rootfiles/updater/filelists/vnstati
deleted file mode 120000 (symlink)
index 92d30e7..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/vnstati
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/wireless b/config/rootfiles/updater/filelists/wireless
deleted file mode 120000 (symlink)
index 5ee9003..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/wireless
\ No newline at end of file
diff --git a/config/rootfiles/updater/filelists/wpa_supplicant b/config/rootfiles/updater/filelists/wpa_supplicant
deleted file mode 120000 (symlink)
index 4aae5c0..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../common/wpa_supplicant
\ No newline at end of file
diff --git a/config/rootfiles/updater/meta b/config/rootfiles/updater/meta
deleted file mode 100644 (file)
index d547fa8..0000000
+++ /dev/null
@@ -1 +0,0 @@
-DEPS=""
diff --git a/config/rootfiles/updater/update.sh b/config/rootfiles/updater/update.sh
deleted file mode 100755 (executable)
index b6a6114..0000000
+++ /dev/null
@@ -1,259 +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) 2008 IPFire-Team <info@ipfire.org>.                        #
-#                                                                          #
-############################################################################
-#
-. /opt/pakfire/lib/functions.sh
-/usr/local/bin/backupctrl exclude >/dev/null 2>&1
-#
-OLDVERSION=`grep "version = " /opt/pakfire/etc/pakfire.conf | cut -d'"' -f2`
-NEWVERSION="2.3"
-KVER="2.6.25.19"
-ROOT=`grep "root=" /boot/grub/grub.conf | cut -d"=" -f2 | cut -d" " -f1 | tail -n 1`
-MOUNT=`grep "kernel" /boot/grub/grub.conf | tail -n 1`
-# Nur den letzten Parameter verwenden
-echo $MOUNT > /dev/null
-MOUNT=$_
-#
-echo 
-echo Update IPFire $OLDVERSION to $NEWVERSION
-echo
-#
-# check if we the backup file already exist
-if [ -e /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz ]; then
-    echo Moving backup to backup-old ...
-    mv -f /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
-       /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION-old.tar.gz
-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 etc/issue >> /opt/pakfire/tmp/ROOTFILES
-echo opt/pakfire/etc/pakfire.conf >> /opt/pakfire/tmp/ROOTFILES
-echo var/spool/cron/root.orig >> /opt/pakfire/tmp/ROOTFILES
-echo etc/udev/rules.d/30-persistent-network.rules >> /opt/pakfire/tmp/ROOTFILES
-echo etc/sysconfig/lm_sensors >> /opt/pakfire/tmp/ROOTFILES
-echo var/log/rrd >> /opt/pakfire/tmp/ROOTFILES
-echo var/log/vnstat >> /opt/pakfire/tmp/ROOTFILES
-echo var/updatexlerator >> /opt/pakfire/tmp/ROOTFILES
-echo lib/iptables >> /opt/pakfire/tmp/ROOTFILES
-echo lib/modules >> /opt/pakfire/tmp/ROOTFILES
-echo boot >> /opt/pakfire/tmp/ROOTFILES
-echo srv/web/ipfire/cgi-bin/fwhits.cgi >> /opt/pakfire/tmp/ROOTFILES
-echo srv/web/ipfire/cgi-bin/network.cgi >> /opt/pakfire/tmp/ROOTFILES
-echo srv/web/ipfire/cgi-bin/traffics.cgi >> /opt/pakfire/tmp/ROOTFILES
-echo srv/web/ipfire/cgi-bin/graphs.cgi >> /opt/pakfire/tmp/ROOTFILES
-echo srv/web/ipfire/cgi-bin/qosgraph.cgi >> /opt/pakfire/tmp/ROOTFILES
-#
-
-# Remove some files from the rootfiles
-cat /opt/pakfire/tmp/ROOTFILES \
-       | grep -v "var/log/cache" \
-       | grep -v "var/updatecache" > /opt/pakfire/tmp/ROOTFILESNEW
-
-mv -f /opt/pakfire/tmp/ROOTFILESNEW /opt/pakfire/tmp/ROOTFILES
-
-tar czvf /var/ipfire/backup/update_$OLDVERSION-$NEWVERSION.tar.gz \
-   -T /opt/pakfire/tmp/ROOTFILES --exclude='#*' -C / > /dev/null 2>&1 
-echo
-echo Update IPfire to $NEWVERSION ...
-#
-# On some systems the folder for addon backups is missing
-#
-if [ ! -e /var/ipfire/backup/addons/backup ]; then
-    mkdir -p /var/ipfire/backup/addons/backup
-fi
-#
-# Delete old collectd symlink
-#
-rm -rf /etc/rc.d/rc3.d/S20collectd
-#
-# Delete squid symlink
-#
-rm -rf /etc/rc.d/rc3.d/S99squid
-#
-# Delete old cgi files ...
-#
-rm -rf /srv/web/ipfire/cgi-bin/fwhits.cgi
-rm -rf /srv/web/ipfire/cgi-bin/network.cgi
-rm -rf /srv/web/ipfire/cgi-bin/traffics.cgi
-rm -rf /srv/web/ipfire/cgi-bin/graphs.cgi
-rm -rf /srv/web/ipfire/cgi-bin/qosgraph.cgi
-#
-# Delete old iptables libs...
-#
-rm -rf /lib/iptables
-#
-# 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/
-#
-# Stopping Squid
-#
-echo
-echo Stopping Squid ...
-/etc/init.d/squid stop
-#
-# Unpack the updated files
-#
-echo
-echo Unpack the updated files ...
-#
-tar xvf /opt/pakfire/tmp/files --preserve --numeric-owner -C / \
-       --no-overwrite-dir
-#
-# Starting Squid
-#
-echo
-echo Starting Squid ...
-/etc/init.d/squid start
-# 
-# Modify grub.conf
-#
-echo 
-echo Update grub configuration ...
-sed -i "s|ROOT|$ROOT|g" /boot/grub/grub.conf
-sed -i "s|KVER|$KVER|g" /boot/grub/grub.conf
-sed -i "s|MOUNT|$MOUNT|g" /boot/grub/grub.conf
-#
-# Made emergency - initramdisk
-#
-echo
-echo Create new Initramdisks ...
-cp -f /etc/mkinitcpio.conf /etc/mkinitcpio.conf.org
-sed -i "s| autodetect | |g" /etc/mkinitcpio.conf
-mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER-emergency.img
-cp -f /etc/mkinitcpio.conf.org /etc/mkinitcpio.conf
-#
-# Made initramdisk
-#
-if [ "${ROOT:0:7}" == "/dev/sd" ]; then
-    # Remove ide hook if root is on sda 
-    sed -i "s| ide | |g" /etc/mkinitcpio.conf
-else
-if [ "${ROOT:0:7}" == "/dev/hd" ]; then
-    # Remove pata & sata hook if root is on hda 
-    sed -i "s| pata | |g" /etc/mkinitcpio.conf
-    sed -i "s| sata | |g" /etc/mkinitcpio.conf
-fi
-fi
-mkinitcpio -k $KVER-ipfire -g /boot/ipfirerd-$KVER.img
-#mkinitcpio -k $KVER-ipfire-smp -g /boot/ipfirerd-$KVER-smp.img
-#
-# ReInstall grub
-#
-grub-install --no-floppy ${ROOT::`expr length $ROOT`-1}
-#
-# Update fstab
-#
-grep -v "tmpfs" /etc/fstab > /tmp/fstab.tmp
-echo "#none    /tmp            tmpfs   defaults        0       0" >> /tmp/fstab.tmp
-echo "none     /var/log/rrd    tmpfs   defaults,size=112M      0       0" >> /tmp/fstab.tmp
-echo "none     /var/lock       tmpfs   defaults,size=8M        0       0" >> /tmp/fstab.tmp
-echo "none     /var/run        tmpfs   defaults,size=8M        0       0" >> /tmp/fstab.tmp
-mv /tmp/fstab.tmp /etc/fstab
-#
-# Change version of Pakfire.conf
-#
-sed -i "s|$OLDVERSION|$NEWVERSION|g" /opt/pakfire/etc/pakfire.conf
-#
-# Create new issue
-#
-echo IPFire v$NEWVERSION - www.ipfire.org > /etc/issue
-echo =================================== >> /etc/issue
-echo \\n running on \\s \\r \\m >> /etc/issue
-#
-# Update crontab
-#
-grep -v "ipacsum" /var/spool/cron/root.orig | grep -v "hddshutdown" > /tmp/root.orig.tmp
-echo "# Backup collectd files" >> /tmp/root.orig.tmp
-echo "* 05 * * *       /etc/init.d/tmpfs backup >/dev/null" >> /tmp/root.orig.tmp
-echo "# hddshutdown" >> /tmp/root.orig.tmp
-echo "*/30 * * * *     /usr/local/bin/hddshutdown >/dev/null" >> /tmp/root.orig.tmp
-mv /tmp/root.orig.tmp /var/spool/cron/root.orig
-chmod 600 /var/spool/cron/root.orig
-chown root:cron /var/spool/cron/root.orig
-#
-# Update network-rules
-#
-sed -i 's|"net", SYSFS{address}|"net", SYSFS{type}=="1", SYSFS{address}|g' \
-          /etc/udev/rules.d/30-persistent-network.rules
-#
-# Move vnstat database to /var/log/rrd
-#
-mkdir -p /var/log/rrd.bak/vnstat
-mkdir -p /var/log/rrd/vnstat
-if [ -e /var/log/vnstat ]; then
-    cp -pR /var/log/vnstat /var/log/rrd.bak/vnstat
-    mv /var/log/vnstat /var/log/rrd/vnstat
-fi
-#
-# Fix qos.sh 
-#
-sed -i 's|rmmod imq|#rmmod imq|g' /var/ipfire/qos/bin/qos.sh
-#
-# Core 17
-#
-perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
-perl /var/ipfire/qos/bin/migrate.pl
-/var/ipfire/updatexlrator/bin/convert
-#
-# Delete old lm-sensor modullist...
-#
-rm -rf /etc/sysconfig/lm_sensors
-#
-# ISDN
-#
-/etc/init.d/mISDN config
-#
-# Remove obsolete packages, update the lists and do upgrade
-#
-echo '#!/bin/bash'                                        >  /tmp/remove_obsolete_paks 
-echo 'while [ "$(ps -A | grep " update.sh")" != "" ]; do' >> /tmp/remove_obsolete_paks
-echo '    sleep 2'                                        >> /tmp/remove_obsolete_paks
-echo 'done'                                               >> /tmp/remove_obsolete_paks
-echo 'while [ "$(ps -A | grep " pakfire")" != "" ]; do'   >> /tmp/remove_obsolete_paks
-echo '    sleep 2'                                        >> /tmp/remove_obsolete_paks
-echo 'done'                                               >> /tmp/remove_obsolete_paks
-echo '/opt/pakfire/pakfire remove -y mpg123 subversion zaptel' >> /tmp/remove_obsolete_paks
-echo '/opt/pakfire/pakfire update -y --force'             >> /tmp/remove_obsolete_paks
-echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
-echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
-echo '/opt/pakfire/pakfire upgrade -y'                    >> /tmp/remove_obsolete_paks
-echo 'logger -p syslog.emerg -t core-upgrade-23 "Upgrade finished. Please reboot... "' >> /tmp/remove_obsolete_paks
-#
-chmod +x /tmp/remove_obsolete_paks
-/tmp/remove_obsolete_paks &
-echo
-echo Please wait until pakfire has ended...
-echo
-
-echo
-echo Finaly were going to renew all ssh keys
-echo
-
-rm -f /etc/ssh/ssh_host_rsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_rsa_key -N ''
-rm -f /etc/ssh/ssh_host_key* && ssh-keygen -qf /etc/ssh/ssh_host_key -N '' -t rsa1
-rm -f /etc/ssh/ssh_host_dsa_key* && ssh-keygen -qf /etc/ssh/ssh_host_dsa_key -N '' -t dsa
diff --git a/lfs/updater b/lfs/updater
deleted file mode 100644 (file)
index 8a81526..0000000
+++ /dev/null
@@ -1,94 +0,0 @@
-###############################################################################
-#                                                                             #
-# IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2007  Michael Tremer & Christian Schmidt                      #
-#                                                                             #
-# This program 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.                                         #
-#                                                                             #
-# This program 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 this program.  If not, see <http://www.gnu.org/licenses/>.       #
-#                                                                             #
-###############################################################################
-
-###############################################################################
-# Definitions
-###############################################################################
-
-include Config
-
-VER = ipfire
-
-THISAPP    = updater
-TARGET     = $(DIR_INFO)/$(THISAPP)
-
-###############################################################################
-# Top-level Rules
-###############################################################################
-
-install : $(TARGET)
-
-check :
-
-download :
-
-md5 :
-
-###############################################################################
-# Installation Details
-###############################################################################
-
-$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
-       rm -rf /install/updater /tmp/*
-       eval $$(cat /usr/src/config/rootfiles/updater/meta)
-
-       # Compress files of filelists 
-       # Reason for this tar+untar+tar is removing of entries listed two or more in src/ROOTFILES
-       mkdir -p /install/updater
-       mkdir -p /install/packages
-
-       find $(DIR_SRC)/config/rootfiles/updater/filelists/* -maxdepth 1 | xargs cat >> /tmp/ROOTFILES
-       cat /tmp/ROOTFILES \
-               | grep -v "etc/httpd/conf" \
-               | grep -v "etc/ssl/openssl.cnf" \
-               | grep -v "etc/ssh/sshd_config" \
-               | grep -v "etc/ipsec.conf" \
-               | grep -v "etc/ipsec.secrets" \
-               | grep -v "etc/snort/snort.conf" \
-               | grep -v "etc/squid/squid.conf" \
-               | grep -v "srv/web/ipfire/html/proxy.pac" \
-               | grep -v "srv/web/ipfire/html/wpad.dat" \
-               > /tmp/ROOTFILESNEW
-       mv -f /tmp/ROOTFILESNEW /tmp/ROOTFILES
-       sed -e "s/KVER/$(KVER)/g" -i /tmp/ROOTFILES
-       tar -c -C / --files-from=/tmp/ROOTFILES \
-               -f /$(SNAME).tar --exclude='#*' --exclude='dev/pts/*' \
-               --exclude='proc/*' --exclude='tmp/ROOTFILES'
-       mv -f /tmp/ROOTFILES /install/updater/ROOTFILES
-       tar --preserve --numeric-owner -x  -C /tmp -f /$(SNAME).tar
-       rm -f /$(SNAME).tar
-       cd /tmp && tar cf /install/updater/files * && rm -rf *
-       cat /install/updater/ROOTFILES | grep -v "#" > /install/updater/ROOTFILES.tmp
-       rm /install/updater/ROOTFILES
-       mv /install/updater/ROOTFILES.tmp /install/updater/ROOTFILES
-
-       # Other files
-       cp $(DIR_SRC)/config/rootfiles/updater/update.sh /install/updater/
-       chmod 755 /install/updater/update.sh
-       cd /install/updater && tar cf /install/packages/core-upgrade-2.1-23.ipfire \
-               update.sh files ROOTFILES
-       rm -rf /install/updater
-
-       sed -e "s/NAME/core-upgrade/g" \
-               -e "s/VER/2.1/g" \
-               -e "s/RELEASE/23/g" \
-               -e "s/DEPS/$(DEPS)/g" \
-               -e "s/SIZE/`ls -l \/install\/packages\/core-upgrade-2.1-23.ipfire | awk '{ print $$5 }'`/g" \
-               < /usr/src/src/pakfire/meta > /install/packages/meta-core-upgrade-23
diff --git a/make.sh b/make.sh
index ec5c7b03df246199ace004e15ac75f8131628b28..bf089b07b9bcf67bdcb0cdca01b1ae808af131cc 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -696,8 +696,6 @@ buildpackages() {
        ipfiremake usb-stick ED=$IPFVER
   fi
 
-  # Create updater package
-  #ipfiremake updater
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
 
   ipfirepackages