webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-11 11:35:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fifteen' of ssh://git.ipfire.org/pub/git/ipfire-2.x into fifteen

Browse Source
This commit is contained in:
Michael Tremer
2014-01-08 22:39:15 +01:00
parent 918bacacbd 2106b71eb5
commit 33c56b4f58
4 changed files with 22 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
config/rootfiles/core/fifteen/filelists/e2fsprogs Symbolic link
View File

@@ -0,0 +1 @@
../../../common/e2fsprogs

1
config/rootfiles/core/fifteen/filelists/files
View File

@@ -2,6 +2,7 @@ etc/system-release
etc/issue
etc/collectd.conf
etc/rc.d/init.d/network
run
srv/web/ipfire/cgi-bin/credits.cgi
srv/web/ipfire/cgi-bin/gui.cgi
srv/web/ipfire/cgi-bin/index.cgi

4
config/rootfiles/core/fifteen/filelists/pakfire Normal file
View File

@@ -0,0 +1,4 @@
opt/pakfire/etc/pakfire.conf
opt/pakfire/lib/functions.pl
opt/pakfire/lib/functions.sh
opt/pakfire/pakfire

21
config/rootfiles/core/fifteen/update.sh
View File

@@ -17,7 +17,7 @@
# along with IPFire; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Copyright (C) 2013 IPFire-Team <info@ipfire.org>. #
# Copyright (C) 2014 IPFire-Team <info@ipfire.org>. #
# #
############################################################################
#
@@ -107,6 +107,8 @@ add_to_backup usr/local/bin/setxtaccess
add_to_backup usr/local/bin/outgoingfwctrl
add_to_backup srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
add_to_backup var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
add_to_backup etc/inittab
add_to_backup etc/fstab
# Backup the files
tar cJvf /var/ipfire/backup/core-upgrade$core_$KVER.tar.xz \
@@ -238,6 +240,15 @@ rm -f /srv/web/ipfire/cgi-bin/{dmzholes,outgoingfw,portfw,xtaccess}.cgi
# Remove old firewall configuration files
rm -rf /var/ipfire/{dmzholes,portfw,outgoing,xtaccess}
# Convert inittab and fstab
sed -i -e "s/tty1 9600$/tty1 9600 --noclear/g" /etc/inittab
sed -i -e "s/^proc/#proc/g" /etc/fstab
sed -i -e "s/^sysfs/#sysfs/g" /etc/fstab
sed -i -e "s/^devpts/#devpts/g" /etc/fstab
# Convert udev persistent network rules
sed -i -e "s/SYSFS{/ATTR{/g" /etc/udev/rules.d/30-persistent-network.rules
#
# Start services
#
@@ -312,16 +323,16 @@ if [ ! "$(grep "^flags.* pae " /proc/cpuinfo)" == "" ]; then
"core-update-$core: WARNING not enough space for pae kernel."
else
echo "Name: linux-pae" > /opt/pakfire/db/installed/meta-linux-pae
echo "ProgVersion: 3.10.24" >> /opt/pakfire/db/installed/meta-linux-pae
echo "Release: 30" >> /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
fi
# Force reinstall xen kernel if it was installed
if [ -e "/opt/pakfire/db/installed/meta-linux-xen" ]; then
echo "Name: linux-xen" > /opt/pakfire/db/installed/meta-linux-xen
echo "ProgVersion: 2.6.32.60" >> /opt/pakfire/db/installed/meta-linux-xen
echo "Release: 24" >> /opt/pakfire/db/installed/meta-linux-xen
echo "ProgVersion: 0" >> /opt/pakfire/db/installed/meta-linux-xen
echo "Release: 0" >> /opt/pakfire/db/installed/meta-linux-xen
# Add xvc0 to /etc/securetty
echo "xvc0" >> /etc/securetty
fi