mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
start core137 and add kernel and IO-Socket-SSL to updater
Signed-off-by: Arne Fitzenreiter <arne_f@ipfire.org>
This commit is contained in:
Arne Fitzenreiter
@@ -1 +0,0 @@
|
||||
../../../common/Archive-Tar
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Archive-Zip
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/BerkeleyDB
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Compress-Zlib
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Convert-TNEF
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Convert-UUlib
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Crypt-PasswdMD5
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Digest
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Digest-HMAC
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Digest-SHA1
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/GD-Graph
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/GD-TextUtil
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/GeoIP
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/HTML-Parser
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/HTML-Tagset
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/HTML-Template
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/IO-Stringy
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Locale-Country
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Mail-Tools
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Net-DNS
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Net-IPv4Addr
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Net-Server
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Net-Telnet
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Net_SSLeay
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Text-Tabs+Wrap
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/URI
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/Unix-Syslog
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/XML-Parser
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/aarch64/gcc
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/apache2
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/armv5tel/gcc
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/bind
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/ca-certificates
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/dhcpcd
|
||||
@@ -1,15 +0,0 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
srv/web/ipfire/cgi-bin/credits.cgi
|
||||
var/ipfire/langs
|
||||
etc/rc.d/init.d/firewall
|
||||
usr/lib/firewall/firewall-lib.pl
|
||||
usr/lib/firewall/rules.pl
|
||||
usr/local/bin/xt_geoip_update
|
||||
srv/web/ipfire/cgi-bin/connections.cgi
|
||||
srv/web/ipfire/cgi-bin/ddns.cgi
|
||||
srv/web/ipfire/cgi-bin/dhcp.cgi
|
||||
srv/web/ipfire/cgi-bin/firewall.cgi
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
|
||||
srv/web/ipfire/cgi-bin/netexternal.cgi
|
||||
srv/web/ipfire/cgi-bin/zoneconf.cgi
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/geoip-generator
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/hwdata
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/i586/gcc
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/i586/openssl-sse2
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/knot
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/liboping
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/libwww-perl
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/logrotate
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssh
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/openssl
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/patch
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Apache-Htpasswd
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-CGI
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Device-Modem
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Device-SerialPort
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Email-Date-Format
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Font-TTF
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-GD
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-IO-String
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-MIME-Lite
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Net-CIDR-Lite
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-NetAddr-IP
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-PDF-API2
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Sort-Naturally
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Switch
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/perl-Text-CSV_XS
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/rrdtool
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/unbound
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/usb_modeswitch
|
||||
@@ -1 +0,0 @@
|
||||
../../../common/usb_modeswitch_data
|
||||
@@ -1 +0,0 @@
|
||||
../../../../common/x86_64/gcc
|
||||
1
config/rootfiles/core/137/filelists/aarch64/linux
Symbolic link
1
config/rootfiles/core/137/filelists/aarch64/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/aarch64/linux
|
||||
1
config/rootfiles/core/137/filelists/aarch64/linux-initrd
Symbolic link
1
config/rootfiles/core/137/filelists/aarch64/linux-initrd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/aarch64/linux-initrd
|
||||
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-initrd-kirkwood
|
||||
1
config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi
Symbolic link
1
config/rootfiles/core/137/filelists/armv5tel/linux-initrd-multi
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-initrd-multi
|
||||
1
config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood
Symbolic link
1
config/rootfiles/core/137/filelists/armv5tel/linux-kirkwood
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-kirkwood
|
||||
1
config/rootfiles/core/137/filelists/armv5tel/linux-multi
Symbolic link
1
config/rootfiles/core/137/filelists/armv5tel/linux-multi
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/armv5tel/linux-multi
|
||||
4
config/rootfiles/core/137/filelists/files
Normal file
4
config/rootfiles/core/137/filelists/files
Normal file
@@ -0,0 +1,4 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
srv/web/ipfire/cgi-bin/credits.cgi
|
||||
var/ipfire/langs
|
||||
1
config/rootfiles/core/137/filelists/i586/linux
Symbolic link
1
config/rootfiles/core/137/filelists/i586/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/linux
|
||||
1
config/rootfiles/core/137/filelists/i586/linux-initrd
Symbolic link
1
config/rootfiles/core/137/filelists/i586/linux-initrd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/i586/linux-initrd
|
||||
1
config/rootfiles/core/137/filelists/x86_64/linux
Symbolic link
1
config/rootfiles/core/137/filelists/x86_64/linux
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/linux
|
||||
1
config/rootfiles/core/137/filelists/x86_64/linux-initrd
Symbolic link
1
config/rootfiles/core/137/filelists/x86_64/linux-initrd
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../../common/x86_64/linux-initrd
|
||||
@@ -24,7 +24,7 @@
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
core=136
|
||||
core=137
|
||||
|
||||
exit_with_error() {
|
||||
# Set last succesfull installed core.
|
||||
@@ -41,6 +41,43 @@ for (( i=1; i<=$core; i++ )); do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
KVER="xxxKVERxxx"
|
||||
|
||||
# Backup uEnv.txt if exist
|
||||
if [ -e /boot/uEnv.txt ]; then
|
||||
cp -vf /boot/uEnv.txt /boot/uEnv.txt.org
|
||||
fi
|
||||
|
||||
# Do some sanity checks.
|
||||
case $(uname -r) in
|
||||
*-ipfire*)
|
||||
# Ok.
|
||||
;;
|
||||
*)
|
||||
exit_with_error "ERROR cannot update. No IPFire Kernel." 1
|
||||
;;
|
||||
esac
|
||||
|
||||
# Check diskspace on root
|
||||
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
|
||||
if [ $ROOTSPACE -lt 80000 ]; then
|
||||
exit_with_error "ERROR cannot update because not enough free space on root." 2
|
||||
exit 2
|
||||
fi
|
||||
|
||||
# Remove the old kernel
|
||||
rm -rf /boot/System.map-*
|
||||
rm -rf /boot/config-*
|
||||
rm -rf /boot/ipfirerd-*
|
||||
rm -rf /boot/initramfs-*
|
||||
rm -rf /boot/vmlinuz-*
|
||||
rm -rf /boot/uImage-*-ipfire-*
|
||||
rm -rf /boot/zImage-*-ipfire-*
|
||||
rm -rf /boot/uInit-*-ipfire-*
|
||||
rm -rf /boot/dtb-*-ipfire-*
|
||||
rm -rf /lib/modules
|
||||
rm -f /etc/sysconfig/lm_sensors
|
||||
|
||||
# Remove files
|
||||
|
||||
@@ -49,37 +86,53 @@ done
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# Remove old perl files
|
||||
rm -rf /usr/bin/perl5.12.3
|
||||
rm -rf /usr/lib/perl5/5.12.3
|
||||
rm -rf /usr/lib/perl5/site_perl/5.12.3
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Update crontab
|
||||
sed -i -e "s|^01 0 \* \* \*./usr/local/bin/logwatch|05 0 \* \* \*\t/usr/local/bin/logwatch|g" /var/spool/cron/root.orig
|
||||
fcrontab -z &>/dev/null
|
||||
|
||||
# Update Language cache
|
||||
/usr/local/bin/update-lang-cache
|
||||
|
||||
# move unbound down after network down
|
||||
mv /etc/rc.d/rc0.d/K79unbound /etc/rc.d/rc0.d/K86unbound
|
||||
mv /etc/rc.d/rc6.d/K79unbound /etc/rc.d/rc6.d/K86unbound
|
||||
|
||||
# Apply local configuration to sshd_config
|
||||
/usr/local/bin/sshctrl
|
||||
|
||||
# Start services
|
||||
/etc/init.d/sshd restart
|
||||
/etc/init.d/apache restart
|
||||
|
||||
# Update GeoIP
|
||||
/usr/local/bin/xt_geoip_update
|
||||
# Search sensors again after reboot into the new kernel
|
||||
rm -f /etc/sysconfig/lm_sensors
|
||||
|
||||
# This update needs a reboot...
|
||||
touch /var/run/need_reboot
|
||||
# Upadate Kernel version uEnv.txt
|
||||
if [ -e /boot/uEnv.txt ]; then
|
||||
sed -i -e "s/KVER=.*/KVER=${KVER}/g" /boot/uEnv.txt
|
||||
fi
|
||||
|
||||
# call user update script (needed for some arm boards)
|
||||
if [ -e /boot/pakfire-kernel-update ]; then
|
||||
/boot/pakfire-kernel-update ${KVER}
|
||||
fi
|
||||
|
||||
case "$(uname -m)" in
|
||||
i?86)
|
||||
# Force (re)install pae kernel if pae is supported
|
||||
rm -rf /opt/pakfire/db/installed/meta-linux-pae
|
||||
rm -rf /opt/pakfire/db/rootfiles/linux-pae
|
||||
if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
|
||||
ROOTSPACE=`df / -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
BOOTSPACE=`df /boot -Pk | sed "s| * | |g" | cut -d" " -f4 | tail -n 1`
|
||||
if [ $BOOTSPACE -lt 22000 -o $ROOTSPACE -lt 120000 ]; then
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: WARNING not enough space for pae kernel."
|
||||
touch /var/run/need_reboot
|
||||
else
|
||||
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
|
||||
echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-pae
|
||||
echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-pae
|
||||
fi
|
||||
else
|
||||
touch /var/run/need_reboot
|
||||
fi
|
||||
;;
|
||||
*)
|
||||
# This update needs a reboot...
|
||||
touch /var/run/need_reboot
|
||||
;;
|
||||
esac
|
||||
|
||||
# Finish
|
||||
/etc/init.d/fireinfo start
|
||||
Reference in New Issue
Block a user