mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-05-05 03:18:00 +02:00
Merge branch 'master' into perl_5.12.2
Conflicts: config/rootfiles/core/47/filelists/files config/rootfiles/core/47/update.sh
This commit is contained in:
@@ -0,0 +1,3 @@
|
||||
etc/ssh/ssh_config
|
||||
etc/ssh/sshd_config
|
||||
etc/ssl/openssl.cnf
|
||||
|
||||
@@ -1,2 +1,11 @@
|
||||
etc/system-release
|
||||
boot/ipfirerd-2.6.32.28.img
|
||||
opt/pakfire/lib/functions.pl
|
||||
var/ipfire/backup/include
|
||||
srv/web/ipfire/cgi-bin/system.cgi
|
||||
srv/web/ipfire/cgi-bin/ddns.cgi
|
||||
usr/local/bin/setddns.pl
|
||||
var/ipfire/langs/de.pl
|
||||
var/ipfire/langs/en.pl
|
||||
var/ipfire/langs/es.pl
|
||||
var/ipfire/langs/fr.pl
|
||||
|
||||
1
config/rootfiles/core/46/filelists/openssh
Symbolic link
1
config/rootfiles/core/46/filelists/openssh
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/openssh
|
||||
1
config/rootfiles/core/46/filelists/openssl
Symbolic link
1
config/rootfiles/core/46/filelists/openssl
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/openssl
|
||||
1
config/rootfiles/core/46/filelists/squid
Symbolic link
1
config/rootfiles/core/46/filelists/squid
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/squid
|
||||
@@ -36,10 +36,11 @@ extract_files
|
||||
|
||||
#
|
||||
#Start services
|
||||
/etc/init.d/squid restart
|
||||
|
||||
#
|
||||
#Update Language cache
|
||||
#perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
perl -e "require '/var/ipfire/lang.pl'; &Lang::BuildCacheLang"
|
||||
|
||||
# Rebuild initrd of optional pae and xen kernel
|
||||
KVER=2.6.32.28
|
||||
@@ -53,5 +54,7 @@ depmod 2.6.32.28-ipfire-xen >/dev/null 2>&1
|
||||
|
||||
#
|
||||
#Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
#Don't report the exitcode last command
|
||||
exit 0
|
||||
|
||||
Reference in New Issue
Block a user