mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-28 03:33:25 +02:00
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next
This commit is contained in:
Stefan Schantl
@@ -516,12 +516,14 @@ sub checksubnets
|
||||
&General::readhasharray("${General::swroot}/vpn/config", \%ipsecconf);
|
||||
foreach my $key (keys %ipsecconf){
|
||||
if ($ipsecconf{$key}[11] ne ''){
|
||||
my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
|
||||
$ipsecsub=&iporsubtodec($ipsecsub);
|
||||
if($ipsecconf{$key}[1] ne $ccdname){
|
||||
if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
|
||||
$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]";
|
||||
return $errormessage;
|
||||
foreach my $ipsecsubitem (split(/\|/, $ipsecconf{$key}[11])) {
|
||||
my ($ipsecip,$ipsecsub) = split (/\//, $ipsecconf{$key}[11]);
|
||||
$ipsecsub=&iporsubtodec($ipsecsub);
|
||||
if($ipsecconf{$key}[1] ne $ccdname){
|
||||
if ( &IpInSubnet ($ip,$ipsecip,$ipsecsub) ){
|
||||
$errormessage=$Lang::tr{'ccd err isipsecnet'}." Name: $ipsecconf{$key}[1]";
|
||||
return $errormessage;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
'title' => "$Lang::tr{'net config'}",
|
||||
'enabled' => 0,
|
||||
};
|
||||
$subnetwork->{'20.proxy'} = {'caption' => 'Webproxy',
|
||||
$subnetwork->{'20.proxy'} = {'caption' => "$Lang::tr{'web proxy'}",
|
||||
'uri' => '/cgi-bin/proxy.cgi',
|
||||
'title' => "Webproxy",
|
||||
'title' => "$Lang::tr{'web proxy'}",
|
||||
'enabled' => 1,
|
||||
};
|
||||
$subnetwork->{'21.urlfilter'} = {'caption' => $Lang::tr{'url filter'},
|
||||
|
||||
2
config/qemu/65-kvm.rules
Normal file
2
config/qemu/65-kvm.rules
Normal file
@@ -0,0 +1,2 @@
|
||||
KERNEL=="kvm", GROUP="kvm", MODE="0660"
|
||||
KERNEL=="vhost-net", GROUP="kvm", MODE="0660", TAG+="uaccess", OPTIONS+="static_node=vhost-net"
|
||||
@@ -45,6 +45,7 @@ etc/rc.d/init.d/ipsec
|
||||
#etc/rc.d/init.d/lcdproc
|
||||
#etc/rc.d/init.d/lcr
|
||||
etc/rc.d/init.d/leds
|
||||
#etc/rc.d/init.d/libvirtd
|
||||
etc/rc.d/init.d/localnet
|
||||
etc/rc.d/init.d/mISDN
|
||||
#etc/rc.d/init.d/mediatomb
|
||||
|
||||
@@ -45,6 +45,7 @@ lib/modules/KVER-ipfire-rpi
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/crypto/deflate.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/crypto/ecb.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/crypto/fcrypt.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/crypto/gcm.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/crypto/gf128mul.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/crypto/ghash-generic.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/crypto/khazad.ko
|
||||
@@ -981,10 +982,6 @@ lib/modules/KVER-ipfire-rpi
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/speakup/speakup_soft.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/vt6656
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/vt6656/vt6656_stage.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/winbond
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/winbond/w35und.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/wlan-ng
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/staging/wlan-ng/prism2_usb.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/uio
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/drivers/uio/uio_pdrv_genirq.ko
|
||||
@@ -1252,7 +1249,6 @@ lib/modules/KVER-ipfire-rpi
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_SYNPROXY.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ULOG.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ah.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_ipp2p.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/ipt_rpfilter.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_filter.ko
|
||||
#lib/modules/KVER-ipfire-rpi/kernel/net/ipv4/netfilter/iptable_mangle.ko
|
||||
|
||||
@@ -1,133 +1,130 @@
|
||||
#usr/bin/aclocal
|
||||
#usr/bin/aclocal-1.12
|
||||
#usr/bin/aclocal-1.15
|
||||
#usr/bin/automake
|
||||
#usr/bin/automake-1.12
|
||||
#usr/share/aclocal-1.12
|
||||
#usr/share/aclocal-1.12/amversion.m4
|
||||
#usr/share/aclocal-1.12/ar-lib.m4
|
||||
#usr/share/aclocal-1.12/as.m4
|
||||
#usr/share/aclocal-1.12/auxdir.m4
|
||||
#usr/share/aclocal-1.12/ccstdc.m4
|
||||
#usr/share/aclocal-1.12/cond-if.m4
|
||||
#usr/share/aclocal-1.12/cond.m4
|
||||
#usr/share/aclocal-1.12/depend.m4
|
||||
#usr/share/aclocal-1.12/depout.m4
|
||||
#usr/share/aclocal-1.12/dmalloc.m4
|
||||
#usr/share/aclocal-1.12/gcj.m4
|
||||
#usr/share/aclocal-1.12/header.m4
|
||||
#usr/share/aclocal-1.12/init.m4
|
||||
#usr/share/aclocal-1.12/install-sh.m4
|
||||
#usr/share/aclocal-1.12/lead-dot.m4
|
||||
#usr/share/aclocal-1.12/lex.m4
|
||||
#usr/share/aclocal-1.12/lispdir.m4
|
||||
#usr/share/aclocal-1.12/maintainer.m4
|
||||
#usr/share/aclocal-1.12/make.m4
|
||||
#usr/share/aclocal-1.12/minuso.m4
|
||||
#usr/share/aclocal-1.12/missing.m4
|
||||
#usr/share/aclocal-1.12/mkdirp.m4
|
||||
#usr/share/aclocal-1.12/obsol-gt.m4
|
||||
#usr/share/aclocal-1.12/obsol-lt.m4
|
||||
#usr/share/aclocal-1.12/obsolete.m4
|
||||
#usr/share/aclocal-1.12/options.m4
|
||||
#usr/share/aclocal-1.12/protos.m4
|
||||
#usr/share/aclocal-1.12/python.m4
|
||||
#usr/share/aclocal-1.12/runlog.m4
|
||||
#usr/share/aclocal-1.12/sanity.m4
|
||||
#usr/share/aclocal-1.12/silent.m4
|
||||
#usr/share/aclocal-1.12/strip.m4
|
||||
#usr/share/aclocal-1.12/substnot.m4
|
||||
#usr/share/aclocal-1.12/tar.m4
|
||||
#usr/share/aclocal-1.12/upc.m4
|
||||
#usr/share/aclocal-1.12/vala.m4
|
||||
#usr/bin/automake-1.15
|
||||
#usr/share/aclocal
|
||||
#usr/share/aclocal-1.15
|
||||
#usr/share/aclocal-1.15/amversion.m4
|
||||
#usr/share/aclocal-1.15/ar-lib.m4
|
||||
#usr/share/aclocal-1.15/as.m4
|
||||
#usr/share/aclocal-1.15/auxdir.m4
|
||||
#usr/share/aclocal-1.15/cond-if.m4
|
||||
#usr/share/aclocal-1.15/cond.m4
|
||||
#usr/share/aclocal-1.15/depend.m4
|
||||
#usr/share/aclocal-1.15/depout.m4
|
||||
#usr/share/aclocal-1.15/dmalloc.m4
|
||||
#usr/share/aclocal-1.15/extra-recurs.m4
|
||||
#usr/share/aclocal-1.15/gcj.m4
|
||||
#usr/share/aclocal-1.15/init.m4
|
||||
#usr/share/aclocal-1.15/install-sh.m4
|
||||
#usr/share/aclocal-1.15/internal
|
||||
#usr/share/aclocal-1.15/internal/ac-config-macro-dirs.m4
|
||||
#usr/share/aclocal-1.15/lead-dot.m4
|
||||
#usr/share/aclocal-1.15/lex.m4
|
||||
#usr/share/aclocal-1.15/lispdir.m4
|
||||
#usr/share/aclocal-1.15/maintainer.m4
|
||||
#usr/share/aclocal-1.15/make.m4
|
||||
#usr/share/aclocal-1.15/missing.m4
|
||||
#usr/share/aclocal-1.15/mkdirp.m4
|
||||
#usr/share/aclocal-1.15/obsolete.m4
|
||||
#usr/share/aclocal-1.15/options.m4
|
||||
#usr/share/aclocal-1.15/prog-cc-c-o.m4
|
||||
#usr/share/aclocal-1.15/python.m4
|
||||
#usr/share/aclocal-1.15/runlog.m4
|
||||
#usr/share/aclocal-1.15/sanity.m4
|
||||
#usr/share/aclocal-1.15/silent.m4
|
||||
#usr/share/aclocal-1.15/strip.m4
|
||||
#usr/share/aclocal-1.15/substnot.m4
|
||||
#usr/share/aclocal-1.15/tar.m4
|
||||
#usr/share/aclocal-1.15/upc.m4
|
||||
#usr/share/aclocal-1.15/vala.m4
|
||||
#usr/share/aclocal/README
|
||||
#usr/share/automake-1.12
|
||||
#usr/share/automake-1.12/Automake
|
||||
#usr/share/automake-1.12/Automake/ChannelDefs.pm
|
||||
#usr/share/automake-1.12/Automake/Channels.pm
|
||||
#usr/share/automake-1.12/Automake/Condition.pm
|
||||
#usr/share/automake-1.12/Automake/Config.pm
|
||||
#usr/share/automake-1.12/Automake/Configure_ac.pm
|
||||
#usr/share/automake-1.12/Automake/DisjConditions.pm
|
||||
#usr/share/automake-1.12/Automake/FileUtils.pm
|
||||
#usr/share/automake-1.12/Automake/General.pm
|
||||
#usr/share/automake-1.12/Automake/Getopt.pm
|
||||
#usr/share/automake-1.12/Automake/Item.pm
|
||||
#usr/share/automake-1.12/Automake/ItemDef.pm
|
||||
#usr/share/automake-1.12/Automake/Location.pm
|
||||
#usr/share/automake-1.12/Automake/Options.pm
|
||||
#usr/share/automake-1.12/Automake/Rule.pm
|
||||
#usr/share/automake-1.12/Automake/RuleDef.pm
|
||||
#usr/share/automake-1.12/Automake/VarDef.pm
|
||||
#usr/share/automake-1.12/Automake/Variable.pm
|
||||
#usr/share/automake-1.12/Automake/Version.pm
|
||||
#usr/share/automake-1.12/Automake/Wrap.pm
|
||||
#usr/share/automake-1.12/Automake/XFile.pm
|
||||
#usr/share/automake-1.12/COPYING
|
||||
#usr/share/automake-1.12/INSTALL
|
||||
#usr/share/automake-1.12/am
|
||||
#usr/share/automake-1.12/am/check.am
|
||||
#usr/share/automake-1.12/am/check2.am
|
||||
#usr/share/automake-1.12/am/clean-hdr.am
|
||||
#usr/share/automake-1.12/am/clean.am
|
||||
#usr/share/automake-1.12/am/compile.am
|
||||
#usr/share/automake-1.12/am/configure.am
|
||||
#usr/share/automake-1.12/am/data.am
|
||||
#usr/share/automake-1.12/am/dejagnu.am
|
||||
#usr/share/automake-1.12/am/depend.am
|
||||
#usr/share/automake-1.12/am/depend2.am
|
||||
#usr/share/automake-1.12/am/distdir.am
|
||||
#usr/share/automake-1.12/am/footer.am
|
||||
#usr/share/automake-1.12/am/header-vars.am
|
||||
#usr/share/automake-1.12/am/header.am
|
||||
#usr/share/automake-1.12/am/inst-vars.am
|
||||
#usr/share/automake-1.12/am/install.am
|
||||
#usr/share/automake-1.12/am/java.am
|
||||
#usr/share/automake-1.12/am/lang-compile.am
|
||||
#usr/share/automake-1.12/am/lex.am
|
||||
#usr/share/automake-1.12/am/library.am
|
||||
#usr/share/automake-1.12/am/libs.am
|
||||
#usr/share/automake-1.12/am/libtool.am
|
||||
#usr/share/automake-1.12/am/lisp.am
|
||||
#usr/share/automake-1.12/am/ltlib.am
|
||||
#usr/share/automake-1.12/am/ltlibrary.am
|
||||
#usr/share/automake-1.12/am/mans-vars.am
|
||||
#usr/share/automake-1.12/am/mans.am
|
||||
#usr/share/automake-1.12/am/program.am
|
||||
#usr/share/automake-1.12/am/progs.am
|
||||
#usr/share/automake-1.12/am/python.am
|
||||
#usr/share/automake-1.12/am/remake-hdr.am
|
||||
#usr/share/automake-1.12/am/scripts.am
|
||||
#usr/share/automake-1.12/am/subdirs.am
|
||||
#usr/share/automake-1.12/am/tags.am
|
||||
#usr/share/automake-1.12/am/texi-vers.am
|
||||
#usr/share/automake-1.12/am/texibuild.am
|
||||
#usr/share/automake-1.12/am/texinfos.am
|
||||
#usr/share/automake-1.12/am/vala.am
|
||||
#usr/share/automake-1.12/am/yacc.am
|
||||
#usr/share/automake-1.12/ar-lib
|
||||
#usr/share/automake-1.12/compile
|
||||
#usr/share/automake-1.12/config.guess
|
||||
#usr/share/automake-1.12/config.sub
|
||||
#usr/share/automake-1.12/depcomp
|
||||
#usr/share/automake-1.12/elisp-comp
|
||||
#usr/share/automake-1.12/install-sh
|
||||
#usr/share/automake-1.12/mdate-sh
|
||||
#usr/share/automake-1.12/missing
|
||||
#usr/share/automake-1.12/mkinstalldirs
|
||||
#usr/share/automake-1.12/py-compile
|
||||
#usr/share/automake-1.12/tap-driver.pl
|
||||
#usr/share/automake-1.12/tap-driver.sh
|
||||
#usr/share/automake-1.12/test-driver
|
||||
#usr/share/automake-1.12/texinfo.tex
|
||||
#usr/share/automake-1.12/ylwrap
|
||||
#usr/share/doc/automake
|
||||
#usr/share/doc/automake/amhello-1.0.tar.gz
|
||||
#usr/share/automake-1.15
|
||||
#usr/share/automake-1.15/Automake
|
||||
#usr/share/automake-1.15/Automake/ChannelDefs.pm
|
||||
#usr/share/automake-1.15/Automake/Channels.pm
|
||||
#usr/share/automake-1.15/Automake/Condition.pm
|
||||
#usr/share/automake-1.15/Automake/Config.pm
|
||||
#usr/share/automake-1.15/Automake/Configure_ac.pm
|
||||
#usr/share/automake-1.15/Automake/DisjConditions.pm
|
||||
#usr/share/automake-1.15/Automake/FileUtils.pm
|
||||
#usr/share/automake-1.15/Automake/General.pm
|
||||
#usr/share/automake-1.15/Automake/Getopt.pm
|
||||
#usr/share/automake-1.15/Automake/Item.pm
|
||||
#usr/share/automake-1.15/Automake/ItemDef.pm
|
||||
#usr/share/automake-1.15/Automake/Language.pm
|
||||
#usr/share/automake-1.15/Automake/Location.pm
|
||||
#usr/share/automake-1.15/Automake/Options.pm
|
||||
#usr/share/automake-1.15/Automake/Rule.pm
|
||||
#usr/share/automake-1.15/Automake/RuleDef.pm
|
||||
#usr/share/automake-1.15/Automake/VarDef.pm
|
||||
#usr/share/automake-1.15/Automake/Variable.pm
|
||||
#usr/share/automake-1.15/Automake/Version.pm
|
||||
#usr/share/automake-1.15/Automake/Wrap.pm
|
||||
#usr/share/automake-1.15/Automake/XFile.pm
|
||||
#usr/share/automake-1.15/COPYING
|
||||
#usr/share/automake-1.15/INSTALL
|
||||
#usr/share/automake-1.15/am
|
||||
#usr/share/automake-1.15/am/check.am
|
||||
#usr/share/automake-1.15/am/check2.am
|
||||
#usr/share/automake-1.15/am/clean-hdr.am
|
||||
#usr/share/automake-1.15/am/clean.am
|
||||
#usr/share/automake-1.15/am/compile.am
|
||||
#usr/share/automake-1.15/am/configure.am
|
||||
#usr/share/automake-1.15/am/data.am
|
||||
#usr/share/automake-1.15/am/dejagnu.am
|
||||
#usr/share/automake-1.15/am/depend.am
|
||||
#usr/share/automake-1.15/am/depend2.am
|
||||
#usr/share/automake-1.15/am/distdir.am
|
||||
#usr/share/automake-1.15/am/footer.am
|
||||
#usr/share/automake-1.15/am/header-vars.am
|
||||
#usr/share/automake-1.15/am/header.am
|
||||
#usr/share/automake-1.15/am/inst-vars.am
|
||||
#usr/share/automake-1.15/am/install.am
|
||||
#usr/share/automake-1.15/am/java.am
|
||||
#usr/share/automake-1.15/am/lang-compile.am
|
||||
#usr/share/automake-1.15/am/lex.am
|
||||
#usr/share/automake-1.15/am/library.am
|
||||
#usr/share/automake-1.15/am/libs.am
|
||||
#usr/share/automake-1.15/am/libtool.am
|
||||
#usr/share/automake-1.15/am/lisp.am
|
||||
#usr/share/automake-1.15/am/ltlib.am
|
||||
#usr/share/automake-1.15/am/ltlibrary.am
|
||||
#usr/share/automake-1.15/am/mans-vars.am
|
||||
#usr/share/automake-1.15/am/mans.am
|
||||
#usr/share/automake-1.15/am/program.am
|
||||
#usr/share/automake-1.15/am/progs.am
|
||||
#usr/share/automake-1.15/am/python.am
|
||||
#usr/share/automake-1.15/am/remake-hdr.am
|
||||
#usr/share/automake-1.15/am/scripts.am
|
||||
#usr/share/automake-1.15/am/subdirs.am
|
||||
#usr/share/automake-1.15/am/tags.am
|
||||
#usr/share/automake-1.15/am/texi-vers.am
|
||||
#usr/share/automake-1.15/am/texibuild.am
|
||||
#usr/share/automake-1.15/am/texinfos.am
|
||||
#usr/share/automake-1.15/am/vala.am
|
||||
#usr/share/automake-1.15/am/yacc.am
|
||||
#usr/share/automake-1.15/ar-lib
|
||||
#usr/share/automake-1.15/compile
|
||||
#usr/share/automake-1.15/config.guess
|
||||
#usr/share/automake-1.15/config.sub
|
||||
#usr/share/automake-1.15/depcomp
|
||||
#usr/share/automake-1.15/install-sh
|
||||
#usr/share/automake-1.15/mdate-sh
|
||||
#usr/share/automake-1.15/missing
|
||||
#usr/share/automake-1.15/mkinstalldirs
|
||||
#usr/share/automake-1.15/py-compile
|
||||
#usr/share/automake-1.15/tap-driver.sh
|
||||
#usr/share/automake-1.15/test-driver
|
||||
#usr/share/automake-1.15/texinfo.tex
|
||||
#usr/share/automake-1.15/ylwrap
|
||||
#usr/share/doc/automake-1.15
|
||||
#usr/share/doc/automake-1.15/amhello-1.0.tar.gz
|
||||
#usr/share/info/automake-history.info
|
||||
#usr/share/info/automake.info
|
||||
#usr/share/info/automake.info-1
|
||||
#usr/share/info/automake.info-2
|
||||
#usr/share/info/automake.info-3
|
||||
#usr/share/man/man1/aclocal-1.12.1
|
||||
#usr/share/man/man1/aclocal-1.15.1
|
||||
#usr/share/man/man1/aclocal.1
|
||||
#usr/share/man/man1/automake-1.12.1
|
||||
#usr/share/man/man1/automake-1.15.1
|
||||
#usr/share/man/man1/automake.1
|
||||
|
||||
@@ -1,8 +1,7 @@
|
||||
bin/find
|
||||
#etc/fcron.weekly
|
||||
etc/fcron.weekly/updatedb
|
||||
bin/find
|
||||
usr/bin/locate
|
||||
#usr/bin/oldfind
|
||||
usr/bin/updatedb
|
||||
usr/bin/xargs
|
||||
#usr/lib/findutils
|
||||
@@ -11,6 +10,8 @@ usr/lib/findutils/code
|
||||
usr/lib/findutils/frcode
|
||||
#usr/share/info/find-maint.info
|
||||
#usr/share/info/find.info
|
||||
#usr/share/info/find.info-1
|
||||
#usr/share/info/find.info-2
|
||||
#usr/share/man/man1/find.1
|
||||
#usr/share/man/man1/locate.1
|
||||
#usr/share/man/man1/updatedb.1
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
#usr/bin/flex
|
||||
#usr/bin/lex
|
||||
#usr/include/FlexLexer.h
|
||||
#usr/info/dir
|
||||
#usr/info/flex.info
|
||||
#usr/info/flex.info-1
|
||||
#usr/info/flex.info-2
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
#usr/bin/autopoint
|
||||
#usr/bin/envsubst
|
||||
#usr/bin/gettext
|
||||
#usr/bin/gettext.sh
|
||||
usr/bin/envsubst
|
||||
usr/bin/gettext
|
||||
usr/bin/gettext.sh
|
||||
#usr/bin/gettextize
|
||||
#usr/bin/msgattrib
|
||||
#usr/bin/msgcat
|
||||
|
||||
@@ -46,6 +46,8 @@ etc/rc.d/init.d/ipsec
|
||||
#etc/rc.d/init.d/lcdproc
|
||||
#etc/rc.d/init.d/lcr
|
||||
etc/rc.d/init.d/leds
|
||||
#etc/rc.d/init.d/libvirt-guests
|
||||
#etc/rc.d/init.d/libvirtd
|
||||
etc/rc.d/init.d/localnet
|
||||
etc/rc.d/init.d/mISDN
|
||||
#etc/rc.d/init.d/mediatomb
|
||||
|
||||
@@ -21,6 +21,7 @@ usr/lib/libatm.so.1.0.0
|
||||
#usr/man/man4/atmsigd.conf.4
|
||||
#usr/man/man7/qos.7
|
||||
#usr/man/man7/sap.7
|
||||
#usr/man/man8
|
||||
#usr/man/man8/atmaddr.8
|
||||
#usr/man/man8/atmarp.8
|
||||
#usr/man/man8/atmarpd.8
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
3610
config/rootfiles/common/ncurses-compat
Normal file
3610
config/rootfiles/common/ncurses-compat
Normal file
File diff suppressed because it is too large
Load Diff
@@ -13,6 +13,8 @@ usr/lib/libnewt.so.0.52.18
|
||||
#usr/share/locale/as
|
||||
#usr/share/locale/as/LC_MESSAGES
|
||||
#usr/share/locale/as/LC_MESSAGES/newt.mo
|
||||
#usr/share/locale/ast
|
||||
#usr/share/locale/ast/LC_MESSAGES
|
||||
#usr/share/locale/ast/LC_MESSAGES/newt.mo
|
||||
#usr/share/locale/bal
|
||||
#usr/share/locale/bal/LC_MESSAGES
|
||||
@@ -100,6 +102,8 @@ usr/lib/libnewt.so.0.52.18
|
||||
#usr/share/locale/nn
|
||||
#usr/share/locale/nn/LC_MESSAGES
|
||||
#usr/share/locale/nn/LC_MESSAGES/newt.mo
|
||||
#usr/share/locale/pa
|
||||
#usr/share/locale/pa/LC_MESSAGES
|
||||
#usr/share/locale/pa/LC_MESSAGES/newt.mo
|
||||
#usr/share/locale/pl/LC_MESSAGES/newt.mo
|
||||
#usr/share/locale/pt/LC_MESSAGES/newt.mo
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
bin/groups
|
||||
bin/login
|
||||
bin/passwd
|
||||
bin/su
|
||||
#etc/.pwd.lock
|
||||
#etc/default
|
||||
#etc/default/useradd
|
||||
etc/limits
|
||||
etc/login.access
|
||||
etc/login.defs
|
||||
#etc/passwd-
|
||||
etc/shadow
|
||||
#etc/shadow-
|
||||
lib/libshadow.so.0
|
||||
lib/libshadow.so.0.0.0
|
||||
sbin/nologin
|
||||
#usr/bin/chage
|
||||
#usr/bin/chfn
|
||||
#usr/bin/chsh
|
||||
@@ -19,64 +18,22 @@ lib/libshadow.so.0.0.0
|
||||
#usr/bin/faillog
|
||||
#usr/bin/gpasswd
|
||||
#usr/bin/lastlog
|
||||
#usr/bin/newgidmap
|
||||
#usr/bin/newgrp
|
||||
#usr/bin/newuidmap
|
||||
#usr/bin/sg
|
||||
#usr/lib/libshadow.a
|
||||
#usr/lib/libshadow.la
|
||||
#usr/lib/libshadow.so
|
||||
#usr/man/man1/chage.1
|
||||
#usr/man/man1/chfn.1
|
||||
#usr/man/man1/chsh.1
|
||||
#usr/man/man1/expiry.1
|
||||
#usr/man/man1/gpasswd.1
|
||||
#usr/man/man1/login.1
|
||||
#usr/man/man1/newgrp.1
|
||||
#usr/man/man1/passwd.1
|
||||
#usr/man/man1/sg.1
|
||||
#usr/man/man1/su.1
|
||||
#usr/man/man3/getspnam.3
|
||||
#usr/man/man3/shadow.3
|
||||
#usr/man/man5/faillog.5
|
||||
#usr/man/man5/gshadow.5
|
||||
#usr/man/man5/limits.5
|
||||
#usr/man/man5/login.access.5
|
||||
#usr/man/man5/login.defs.5
|
||||
#usr/man/man5/passwd.5
|
||||
#usr/man/man5/porttime.5
|
||||
#usr/man/man5/shadow.5
|
||||
#usr/man/man5/suauth.5
|
||||
#usr/man/man8
|
||||
#usr/man/man8/chpasswd.8
|
||||
#usr/man/man8/faillog.8
|
||||
#usr/man/man8/groupadd.8
|
||||
#usr/man/man8/groupdel.8
|
||||
#usr/man/man8/groupmod.8
|
||||
#usr/man/man8/grpck.8
|
||||
#usr/man/man8/grpconv.8
|
||||
#usr/man/man8/grpunconv.8
|
||||
#usr/man/man8/lastlog.8
|
||||
#usr/man/man8/logoutd.8
|
||||
#usr/man/man8/newusers.8
|
||||
#usr/man/man8/nologin.8
|
||||
#usr/man/man8/pwck.8
|
||||
#usr/man/man8/pwconv.8
|
||||
#usr/man/man8/pwunconv.8
|
||||
#usr/man/man8/useradd.8
|
||||
#usr/man/man8/userdel.8
|
||||
#usr/man/man8/usermod.8
|
||||
#usr/man/man8/vigr.8
|
||||
#usr/man/man8/vipw.8
|
||||
#usr/sbin/chgpasswd
|
||||
usr/sbin/chpasswd
|
||||
usr/sbin/groupadd
|
||||
usr/sbin/groupdel
|
||||
usr/sbin/groupmems
|
||||
usr/sbin/groupmod
|
||||
#usr/sbin/grpck
|
||||
usr/sbin/grpconv
|
||||
#usr/sbin/grpunconv
|
||||
#usr/sbin/logoutd
|
||||
#usr/sbin/newusers
|
||||
#usr/sbin/nologin
|
||||
#usr/sbin/pwck
|
||||
usr/sbin/pwconv
|
||||
#usr/sbin/pwunconv
|
||||
@@ -85,3 +42,48 @@ usr/sbin/userdel
|
||||
usr/sbin/usermod
|
||||
#usr/sbin/vigr
|
||||
#usr/sbin/vipw
|
||||
#usr/share/man/man1/chage.1
|
||||
#usr/share/man/man1/chfn.1
|
||||
#usr/share/man/man1/chsh.1
|
||||
#usr/share/man/man1/expiry.1
|
||||
#usr/share/man/man1/gpasswd.1
|
||||
#usr/share/man/man1/login.1
|
||||
#usr/share/man/man1/newgidmap.1
|
||||
#usr/share/man/man1/newgrp.1
|
||||
#usr/share/man/man1/newuidmap.1
|
||||
#usr/share/man/man1/passwd.1
|
||||
#usr/share/man/man1/sg.1
|
||||
#usr/share/man/man1/su.1
|
||||
#usr/share/man/man3/shadow.3
|
||||
#usr/share/man/man5/faillog.5
|
||||
#usr/share/man/man5/gshadow.5
|
||||
#usr/share/man/man5/limits.5
|
||||
#usr/share/man/man5/login.access.5
|
||||
#usr/share/man/man5/login.defs.5
|
||||
#usr/share/man/man5/porttime.5
|
||||
#usr/share/man/man5/shadow.5
|
||||
#usr/share/man/man5/suauth.5
|
||||
#usr/share/man/man5/subgid.5
|
||||
#usr/share/man/man5/subuid.5
|
||||
#usr/share/man/man8/chgpasswd.8
|
||||
#usr/share/man/man8/chpasswd.8
|
||||
#usr/share/man/man8/faillog.8
|
||||
#usr/share/man/man8/groupadd.8
|
||||
#usr/share/man/man8/groupdel.8
|
||||
#usr/share/man/man8/groupmems.8
|
||||
#usr/share/man/man8/groupmod.8
|
||||
#usr/share/man/man8/grpck.8
|
||||
#usr/share/man/man8/grpconv.8
|
||||
#usr/share/man/man8/grpunconv.8
|
||||
#usr/share/man/man8/lastlog.8
|
||||
#usr/share/man/man8/logoutd.8
|
||||
#usr/share/man/man8/newusers.8
|
||||
#usr/share/man/man8/nologin.8
|
||||
#usr/share/man/man8/pwck.8
|
||||
#usr/share/man/man8/pwconv.8
|
||||
#usr/share/man/man8/pwunconv.8
|
||||
#usr/share/man/man8/useradd.8
|
||||
#usr/share/man/man8/userdel.8
|
||||
#usr/share/man/man8/usermod.8
|
||||
#usr/share/man/man8/vigr.8
|
||||
#usr/share/man/man8/vipw.8
|
||||
|
||||
@@ -28,6 +28,7 @@ lib/udev
|
||||
#lib/udev/hwdb.d/60-keyboard.hwdb
|
||||
#lib/udev/init-net-rules.sh
|
||||
#lib/udev/mtd_probe
|
||||
#lib/udev/network-hotplug-macvtap
|
||||
#lib/udev/network-hotplug-rename
|
||||
#lib/udev/network-hotplug-vlan
|
||||
#lib/udev/rule_generator.functions
|
||||
|
||||
4
config/rootfiles/common/util-macros
Normal file
4
config/rootfiles/common/util-macros
Normal file
@@ -0,0 +1,4 @@
|
||||
#usr/share/aclocal/xorg-macros.m4
|
||||
#usr/share/pkgconfig/xorg-macros.pc
|
||||
#usr/share/util-macros
|
||||
#usr/share/util-macros/INSTALL
|
||||
@@ -46,6 +46,8 @@ etc/rc.d/init.d/ipsec
|
||||
#etc/rc.d/init.d/lcdproc
|
||||
#etc/rc.d/init.d/lcr
|
||||
etc/rc.d/init.d/leds
|
||||
#etc/rc.d/init.d/libvirt-guests
|
||||
#etc/rc.d/init.d/libvirtd
|
||||
etc/rc.d/init.d/localnet
|
||||
etc/rc.d/init.d/mISDN
|
||||
#etc/rc.d/init.d/mediatomb
|
||||
|
||||
@@ -1,2 +1,3 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
opt/pakfire/lib/functions.sh
|
||||
1
config/rootfiles/core/104/filelists/ntp
Symbolic link
1
config/rootfiles/core/104/filelists/ntp
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/ntp
|
||||
1
config/rootfiles/core/104/filelists/shadow
Symbolic link
1
config/rootfiles/core/104/filelists/shadow
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/shadow
|
||||
1
config/rootfiles/core/104/filelists/wget
Symbolic link
1
config/rootfiles/core/104/filelists/wget
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/wget
|
||||
@@ -24,7 +24,7 @@
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
core=103
|
||||
core=104
|
||||
|
||||
function exit_with_error() {
|
||||
# Set last succesfull installed core.
|
||||
@@ -40,16 +40,14 @@ do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
|
||||
# Stop services
|
||||
|
||||
# Remove checkfstab
|
||||
rm -f /etc/rc.d/init.d/checkfstab
|
||||
rm -f /etc/rc.d/rcsysinit.d/S19checkfstab
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# Remove some old files
|
||||
rm -f /bin/groups /lib/libshadow.so.0*
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
@@ -57,11 +55,10 @@ ldconfig
|
||||
#/usr/local/bin/update-lang-cache
|
||||
|
||||
# Start services
|
||||
/etc/init.d/dnsmasq restart
|
||||
|
||||
sync
|
||||
# This update need a reboot...
|
||||
touch /var/run/need_reboot
|
||||
sync
|
||||
|
||||
# Finish
|
||||
/etc/init.d/fireinfo start
|
||||
28
config/rootfiles/oldcore/103/exclude
Normal file
28
config/rootfiles/oldcore/103/exclude
Normal file
@@ -0,0 +1,28 @@
|
||||
boot/config.txt
|
||||
boot/grub/grub.cfg
|
||||
boot/grub/grubenv
|
||||
etc/alternatives
|
||||
etc/collectd.custom
|
||||
etc/default/grub
|
||||
etc/ipsec.conf
|
||||
etc/ipsec.secrets
|
||||
etc/ipsec.user.conf
|
||||
etc/ipsec.user.secrets
|
||||
etc/localtime
|
||||
etc/shadow
|
||||
etc/snort/snort.conf
|
||||
etc/ssh/ssh_config
|
||||
etc/ssh/sshd_config
|
||||
etc/ssl/openssl.cnf
|
||||
etc/sudoers
|
||||
etc/sysconfig/firewall.local
|
||||
etc/sysconfig/rc.local
|
||||
etc/udev/rules.d/30-persistent-network.rules
|
||||
srv/web/ipfire/html/proxy.pac
|
||||
var/ipfire/dma
|
||||
var/ipfire/time
|
||||
var/ipfire/ovpn
|
||||
var/lib/alternatives
|
||||
var/log/cache
|
||||
var/state/dhcp/dhcpd.leases
|
||||
var/updatecache
|
||||
1
config/rootfiles/oldcore/103/filelists/coreutils
Symbolic link
1
config/rootfiles/oldcore/103/filelists/coreutils
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/coreutils
|
||||
1
config/rootfiles/oldcore/103/filelists/curl
Symbolic link
1
config/rootfiles/oldcore/103/filelists/curl
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/curl
|
||||
1
config/rootfiles/oldcore/103/filelists/diffutils
Symbolic link
1
config/rootfiles/oldcore/103/filelists/diffutils
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/diffutils
|
||||
9
config/rootfiles/oldcore/103/filelists/files
Normal file
9
config/rootfiles/oldcore/103/filelists/files
Normal file
@@ -0,0 +1,9 @@
|
||||
etc/system-release
|
||||
etc/issue
|
||||
lib/udev/network-hotplug-macvtap
|
||||
lib/udev/network-hotplug-rename
|
||||
lib/udev/rules.d/60-net.rules
|
||||
srv/web/ipfire/cgi-bin/logs.cgi/log.dat
|
||||
usr/sbin/setup
|
||||
var/ipfire/general-functions.pl
|
||||
var/ipfire/menu.d/30-network.menu
|
||||
1
config/rootfiles/oldcore/103/filelists/findutils
Symbolic link
1
config/rootfiles/oldcore/103/filelists/findutils
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/findutils
|
||||
1
config/rootfiles/oldcore/103/filelists/gawk
Symbolic link
1
config/rootfiles/oldcore/103/filelists/gawk
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/gawk
|
||||
1
config/rootfiles/oldcore/103/filelists/gettext
Symbolic link
1
config/rootfiles/oldcore/103/filelists/gettext
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/gettext
|
||||
1
config/rootfiles/oldcore/103/filelists/grep
Symbolic link
1
config/rootfiles/oldcore/103/filelists/grep
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/grep
|
||||
1
config/rootfiles/oldcore/103/filelists/less
Symbolic link
1
config/rootfiles/oldcore/103/filelists/less
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/less
|
||||
1
config/rootfiles/oldcore/103/filelists/ncurses
Symbolic link
1
config/rootfiles/oldcore/103/filelists/ncurses
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/ncurses
|
||||
1
config/rootfiles/oldcore/103/filelists/ncurses-compat
Symbolic link
1
config/rootfiles/oldcore/103/filelists/ncurses-compat
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/ncurses-compat
|
||||
1
config/rootfiles/oldcore/103/filelists/procps
Symbolic link
1
config/rootfiles/oldcore/103/filelists/procps
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/procps
|
||||
1
config/rootfiles/oldcore/103/filelists/sdparm
Symbolic link
1
config/rootfiles/oldcore/103/filelists/sdparm
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/sdparm
|
||||
1
config/rootfiles/oldcore/103/filelists/squid
Symbolic link
1
config/rootfiles/oldcore/103/filelists/squid
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/squid
|
||||
1
config/rootfiles/oldcore/103/filelists/tzdata
Symbolic link
1
config/rootfiles/oldcore/103/filelists/tzdata
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/tzdata
|
||||
1
config/rootfiles/oldcore/103/filelists/wpa_supplicant
Symbolic link
1
config/rootfiles/oldcore/103/filelists/wpa_supplicant
Symbolic link
@@ -0,0 +1 @@
|
||||
../../../common/wpa_supplicant
|
||||
1
config/rootfiles/oldcore/103/meta
Normal file
1
config/rootfiles/oldcore/103/meta
Normal file
@@ -0,0 +1 @@
|
||||
DEPS=""
|
||||
82
config/rootfiles/oldcore/103/update.sh
Normal file
82
config/rootfiles/oldcore/103/update.sh
Normal file
@@ -0,0 +1,82 @@
|
||||
#!/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) 2016 IPFire-Team <info@ipfire.org>. #
|
||||
# #
|
||||
############################################################################
|
||||
#
|
||||
. /opt/pakfire/lib/functions.sh
|
||||
/usr/local/bin/backupctrl exclude >/dev/null 2>&1
|
||||
|
||||
core=103
|
||||
|
||||
function exit_with_error() {
|
||||
# Set last succesfull installed core.
|
||||
echo $(($core-1)) > /opt/pakfire/db/core/mine
|
||||
/usr/bin/logger -p syslog.emerg -t ipfire \
|
||||
"core-update-${core}: $1"
|
||||
exit $2
|
||||
}
|
||||
|
||||
# Remove old core updates from pakfire cache to save space...
|
||||
for (( i=1; i<=$core; i++ ))
|
||||
do
|
||||
rm -f /var/cache/pakfire/core-upgrade-*-$i.ipfire
|
||||
done
|
||||
|
||||
|
||||
# Stop services
|
||||
/etc/init.d/squid stop
|
||||
|
||||
# Remove checkfstab
|
||||
rm -f /etc/rc.d/init.d/checkfstab
|
||||
rm -f /etc/rc.d/rcsysinit.d/S19checkfstab
|
||||
|
||||
# Extract files
|
||||
extract_files
|
||||
|
||||
# update linker config
|
||||
ldconfig
|
||||
|
||||
# Update Language cache
|
||||
#/usr/local/bin/update-lang-cache
|
||||
|
||||
# Remove potentially broken squid cache index (will be recreated after the next start)
|
||||
rm -f /var/log/cache/swap.state
|
||||
|
||||
# Start services
|
||||
/etc/init.d/dnsmasq restart
|
||||
/etc/init.d/squid start
|
||||
|
||||
sync
|
||||
# This update need a reboot...
|
||||
touch /var/run/need_reboot
|
||||
|
||||
# Finish
|
||||
/etc/init.d/fireinfo start
|
||||
sendprofile
|
||||
|
||||
# Update grub config to display new core version
|
||||
if [ -e /boot/grub/grub.cfg ]; then
|
||||
grub-mkconfig -o /boot/grub/grub.cfg
|
||||
fi
|
||||
sync
|
||||
|
||||
# Don't report the exitcode last command
|
||||
exit 0
|
||||
@@ -1,5 +1,5 @@
|
||||
etc/igmpproxy.conf
|
||||
usr/local/sbin/igmpproxy
|
||||
#usr/local/share/man/man5/igmpproxy.conf.5
|
||||
#usr/local/share/man/man8/igmpproxy.8
|
||||
usr/sbin/igmpproxy
|
||||
#usr/share/man/man5/igmpproxy.conf.5
|
||||
#usr/share/man/man8/igmpproxy.8
|
||||
var/ipfire/backup/addons/includes/igmpproxy
|
||||
|
||||
7
config/rootfiles/packages/libpciaccess
Normal file
7
config/rootfiles/packages/libpciaccess
Normal file
@@ -0,0 +1,7 @@
|
||||
#usr/include/pciaccess.h
|
||||
#usr/lib/libpciaccess.a
|
||||
#usr/lib/libpciaccess.la
|
||||
#usr/lib/libpciaccess.so
|
||||
usr/lib/libpciaccess.so.0
|
||||
usr/lib/libpciaccess.so.0.11.1
|
||||
#usr/lib/pkgconfig/pciaccess.pc
|
||||
287
config/rootfiles/packages/libvirt
Normal file
287
config/rootfiles/packages/libvirt
Normal file
@@ -0,0 +1,287 @@
|
||||
#etc/libvirt
|
||||
etc/libvirt/libvirt.conf
|
||||
etc/libvirt/libvirtd.conf
|
||||
#etc/libvirt/nwfilter
|
||||
#etc/libvirt/nwfilter/allow-arp.xml
|
||||
#etc/libvirt/nwfilter/allow-dhcp-server.xml
|
||||
#etc/libvirt/nwfilter/allow-dhcp.xml
|
||||
#etc/libvirt/nwfilter/allow-incoming-ipv4.xml
|
||||
#etc/libvirt/nwfilter/allow-ipv4.xml
|
||||
#etc/libvirt/nwfilter/clean-traffic.xml
|
||||
#etc/libvirt/nwfilter/no-arp-ip-spoofing.xml
|
||||
#etc/libvirt/nwfilter/no-arp-mac-spoofing.xml
|
||||
#etc/libvirt/nwfilter/no-arp-spoofing.xml
|
||||
#etc/libvirt/nwfilter/no-ip-multicast.xml
|
||||
#etc/libvirt/nwfilter/no-ip-spoofing.xml
|
||||
#etc/libvirt/nwfilter/no-mac-broadcast.xml
|
||||
#etc/libvirt/nwfilter/no-mac-spoofing.xml
|
||||
#etc/libvirt/nwfilter/no-other-l2-traffic.xml
|
||||
#etc/libvirt/nwfilter/no-other-rarp-traffic.xml
|
||||
#etc/libvirt/nwfilter/qemu-announce-self-rarp.xml
|
||||
#etc/libvirt/nwfilter/qemu-announce-self.xml
|
||||
etc/libvirt/qemu-lockd.conf
|
||||
etc/libvirt/qemu.conf
|
||||
etc/libvirt/virtlockd.conf
|
||||
etc/logrotate.d/libvirtd
|
||||
etc/logrotate.d/libvirtd.libxl
|
||||
#etc/logrotate.d/libvirtd.lxc
|
||||
etc/logrotate.d/libvirtd.qemu
|
||||
#etc/logrotate.d/libvirtd.uml
|
||||
etc/rc.d/init.d/libvirt-guests
|
||||
etc/rc.d/init.d/libvirtd
|
||||
usr/bin/virsh
|
||||
usr/bin/virt-host-validate
|
||||
usr/bin/virt-pki-validate
|
||||
usr/bin/virt-xml-validate
|
||||
#usr/include/libvirt
|
||||
#usr/include/libvirt/libvirt-domain-snapshot.h
|
||||
#usr/include/libvirt/libvirt-domain.h
|
||||
#usr/include/libvirt/libvirt-event.h
|
||||
#usr/include/libvirt/libvirt-host.h
|
||||
#usr/include/libvirt/libvirt-interface.h
|
||||
#usr/include/libvirt/libvirt-lxc.h
|
||||
#usr/include/libvirt/libvirt-network.h
|
||||
#usr/include/libvirt/libvirt-nodedev.h
|
||||
#usr/include/libvirt/libvirt-nwfilter.h
|
||||
#usr/include/libvirt/libvirt-qemu.h
|
||||
#usr/include/libvirt/libvirt-secret.h
|
||||
#usr/include/libvirt/libvirt-storage.h
|
||||
#usr/include/libvirt/libvirt-stream.h
|
||||
#usr/include/libvirt/libvirt.h
|
||||
#usr/include/libvirt/virterror.h
|
||||
#usr/lib/libvirt
|
||||
#usr/lib/libvirt-admin.la
|
||||
#usr/lib/libvirt-admin.so
|
||||
usr/lib/libvirt-admin.so.0
|
||||
usr/lib/libvirt-admin.so.0.1002.18
|
||||
#usr/lib/libvirt-lxc.la
|
||||
#usr/lib/libvirt-lxc.so
|
||||
usr/lib/libvirt-lxc.so.0
|
||||
usr/lib/libvirt-lxc.so.0.1002.18
|
||||
#usr/lib/libvirt-qemu.la
|
||||
#usr/lib/libvirt-qemu.so
|
||||
usr/lib/libvirt-qemu.so.0
|
||||
usr/lib/libvirt-qemu.so.0.1002.18
|
||||
#usr/lib/libvirt.la
|
||||
#usr/lib/libvirt.so
|
||||
usr/lib/libvirt.so.0
|
||||
usr/lib/libvirt.so.0.1002.18
|
||||
#usr/lib/libvirt/connection-driver
|
||||
#usr/lib/libvirt/connection-driver/libvirt_driver_interface.la
|
||||
usr/lib/libvirt/connection-driver/libvirt_driver_interface.so
|
||||
#usr/lib/libvirt/connection-driver/libvirt_driver_nodedev.la
|
||||
usr/lib/libvirt/connection-driver/libvirt_driver_nodedev.so
|
||||
#usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.la
|
||||
usr/lib/libvirt/connection-driver/libvirt_driver_nwfilter.so
|
||||
#usr/lib/libvirt/connection-driver/libvirt_driver_qemu.la
|
||||
usr/lib/libvirt/connection-driver/libvirt_driver_qemu.so
|
||||
#usr/lib/libvirt/connection-driver/libvirt_driver_secret.la
|
||||
usr/lib/libvirt/connection-driver/libvirt_driver_secret.so
|
||||
#usr/lib/libvirt/connection-driver/libvirt_driver_storage.la
|
||||
usr/lib/libvirt/connection-driver/libvirt_driver_storage.so
|
||||
#usr/lib/libvirt/lock-driver
|
||||
#usr/lib/libvirt/lock-driver/lockd.la
|
||||
usr/lib/libvirt/lock-driver/lockd.so
|
||||
#usr/lib/pkgconfig/libvirt-lxc.pc
|
||||
#usr/lib/pkgconfig/libvirt-qemu.pc
|
||||
#usr/lib/pkgconfig/libvirt.pc
|
||||
#usr/lib/sysctl.d
|
||||
usr/lib/sysctl.d/60-libvirtd.conf
|
||||
usr/libexec/libvirt_iohelper
|
||||
usr/sbin/libvirtd
|
||||
usr/sbin/virtlockd
|
||||
#usr/share/augeas
|
||||
#usr/share/augeas/lenses
|
||||
#usr/share/augeas/lenses/libvirt_lockd.aug
|
||||
#usr/share/augeas/lenses/libvirtd.aug
|
||||
#usr/share/augeas/lenses/libvirtd_qemu.aug
|
||||
#usr/share/augeas/lenses/tests
|
||||
#usr/share/augeas/lenses/tests/test_libvirt_lockd.aug
|
||||
#usr/share/augeas/lenses/tests/test_libvirtd.aug
|
||||
#usr/share/augeas/lenses/tests/test_libvirtd_qemu.aug
|
||||
#usr/share/augeas/lenses/tests/test_virtlockd.aug
|
||||
#usr/share/augeas/lenses/virtlockd.aug
|
||||
#usr/share/doc/libvirt-1.2.18.3
|
||||
#usr/share/doc/libvirt-1.2.18.3/html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/32favicon.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/404.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/acl.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/aclpolkit.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/api.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/api_extension.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/apps.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/archdomain.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/architecture.gif
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/architecture.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/archnetwork.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/archnode.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/archstorage.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/auditlog.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/auth.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/bindings.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/bugs.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/cgroups.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/compiling.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/contact.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/csharp.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/deployment.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/devguide.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/docs.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/downloads.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drivers.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvbhyve.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvesx.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvhyperv.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvlxc.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvopenvz.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvparallels.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvphyp.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvqemu.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvremote.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvtest.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvuml.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvvbox.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvvmware.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/drvxen.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/errors.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/et.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/firewall.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/footer_corner.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/footer_pattern.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/format.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatcaps.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatdomain.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatdomaincaps.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatnetwork.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatnode.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatnwfilter.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatsecret.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatsnapshot.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatstorage.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/formatstorageencryption.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/generic.css
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/goals.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/governance.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/hacking.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/hooks.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/home.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/index.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/left.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain-snapshot.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-domain.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-event.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-host.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-interface.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-network.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nodedev.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-nwfilter.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-secret.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-storage.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-libvirt-stream.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/libvirt-virterror.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/right.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/html/up.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/hvsupport.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/index.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/internals
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/internals.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/internals/command.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/internals/locking.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/internals/oomtesting.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/internals/rpc.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/intro.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/java.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-daemon-arch.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-driver-arch.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-bg.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-header-logo.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-logical.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-net-physical.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt-object-model.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirt.css
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/libvirtLogo.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/locking-lockd.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/locking-sanlock.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/locking.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/logging.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/madeWith.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/main.css
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-direct.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/migration-managed-p2p.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/migration-native.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/migration-tunnel.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/migration-unmanaged-direct.png
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/migration.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/news.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/node.gif
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/pending.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/php.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/python.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/relatedlinks.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/remote.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/secureusage.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/securityprocess.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/sitemap.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/storage.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/testapi.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/testsuites.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/testtck.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/todo.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/uri.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/virshcmdref.html
|
||||
#usr/share/doc/libvirt-1.2.18.3/html/windows.html
|
||||
#usr/share/gtk-doc/html/libvirt
|
||||
#usr/share/gtk-doc/html/libvirt/general.html
|
||||
#usr/share/gtk-doc/html/libvirt/home.png
|
||||
#usr/share/gtk-doc/html/libvirt/index.html
|
||||
#usr/share/gtk-doc/html/libvirt/left.png
|
||||
#usr/share/gtk-doc/html/libvirt/libvirt-virterror.html
|
||||
#usr/share/gtk-doc/html/libvirt/libvirt.devhelp
|
||||
#usr/share/gtk-doc/html/libvirt/right.png
|
||||
#usr/share/gtk-doc/html/libvirt/style.css
|
||||
#usr/share/gtk-doc/html/libvirt/up.png
|
||||
#usr/share/libvirt
|
||||
#usr/share/libvirt/api
|
||||
usr/share/libvirt/api/libvirt-api.xml
|
||||
usr/share/libvirt/api/libvirt-lxc-api.xml
|
||||
usr/share/libvirt/api/libvirt-qemu-api.xml
|
||||
usr/share/libvirt/cpu_map.xml
|
||||
#usr/share/libvirt/libvirtLogo.png
|
||||
#usr/share/libvirt/schemas
|
||||
usr/share/libvirt/schemas/basictypes.rng
|
||||
usr/share/libvirt/schemas/capability.rng
|
||||
usr/share/libvirt/schemas/domain.rng
|
||||
usr/share/libvirt/schemas/domaincaps.rng
|
||||
usr/share/libvirt/schemas/domaincommon.rng
|
||||
usr/share/libvirt/schemas/domainsnapshot.rng
|
||||
usr/share/libvirt/schemas/interface.rng
|
||||
usr/share/libvirt/schemas/network.rng
|
||||
usr/share/libvirt/schemas/networkcommon.rng
|
||||
usr/share/libvirt/schemas/nodedev.rng
|
||||
usr/share/libvirt/schemas/nwfilter.rng
|
||||
usr/share/libvirt/schemas/secret.rng
|
||||
usr/share/libvirt/schemas/storagecommon.rng
|
||||
usr/share/libvirt/schemas/storagepool.rng
|
||||
usr/share/libvirt/schemas/storagevol.rng
|
||||
#usr/share/man/man1/virsh.1
|
||||
#usr/share/man/man1/virt-host-validate.1
|
||||
#usr/share/man/man1/virt-pki-validate.1
|
||||
#usr/share/man/man1/virt-xml-validate.1
|
||||
#usr/share/man/man8/libvirtd.8
|
||||
#usr/share/man/man8/virtlockd.8
|
||||
#var/cache/libvirt
|
||||
var/cache/libvirt/qemu
|
||||
#var/lib/libvirt
|
||||
var/lib/libvirt/boot
|
||||
var/lib/libvirt/filesystems
|
||||
var/lib/libvirt/images
|
||||
#var/lib/libvirt/lockd
|
||||
var/lib/libvirt/lockd/files
|
||||
var/lib/libvirt/qemu
|
||||
#var/log/libvirt
|
||||
#var/log/libvirt/lxc
|
||||
var/log/libvirt/qemu
|
||||
#var/log/libvirt/uml
|
||||
etc/rc.d/init.d/libvirt-guests
|
||||
etc/rc.d/init.d/libvirtd
|
||||
13
config/rootfiles/packages/libyajl
Normal file
13
config/rootfiles/packages/libyajl
Normal file
@@ -0,0 +1,13 @@
|
||||
usr/bin/json_reformat
|
||||
usr/bin/json_verify
|
||||
#usr/include/yajl
|
||||
#usr/include/yajl/yajl_common.h
|
||||
#usr/include/yajl/yajl_gen.h
|
||||
#usr/include/yajl/yajl_parse.h
|
||||
#usr/include/yajl/yajl_tree.h
|
||||
#usr/include/yajl/yajl_version.h
|
||||
#usr/lib/libyajl.so
|
||||
usr/lib/libyajl.so.2
|
||||
usr/lib/libyajl.so.2.1.0
|
||||
#usr/lib/libyajl_s.a
|
||||
#usr/share/pkgconfig/yajl.pc
|
||||
@@ -1,3 +1,4 @@
|
||||
lib/udev/rules.d/65-kvm.rules
|
||||
usr/bin/qemu
|
||||
usr/bin/qemu-arm
|
||||
usr/bin/qemu-ga
|
||||
|
||||
@@ -5,3 +5,6 @@ ACTION=="add", SUBSYSTEM=="net", PROGRAM="/lib/udev/network-hotplug-rename", RES
|
||||
# Call a script that will create all virtual devices for a parent device
|
||||
# that has just come up.
|
||||
ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-vlan"
|
||||
|
||||
# Call a script that will set up macvtap interfaces
|
||||
ACTION=="add", SUBSYSTEM=="net", RUN+="/lib/udev/network-hotplug-macvtap"
|
||||
|
||||
46
config/udev/network-hotplug-macvtap
Normal file
46
config/udev/network-hotplug-macvtap
Normal file
@@ -0,0 +1,46 @@
|
||||
#!/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 2 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) 2016 IPFire Team <info@ipfire.org> #
|
||||
# #
|
||||
############################################################################
|
||||
|
||||
[ -n "${INTERFACE}" ] || exit 2
|
||||
|
||||
PHYSICAL_INTERFACE="${INTERFACE}"
|
||||
VIRTUAL_INTERFACE="${INTERFACE%phys}"
|
||||
#VIRTUAL_INTERFACE="${VIRTUAL_INTERFACE}0"
|
||||
|
||||
# Do nothing if the physical interface does not end with "phys"
|
||||
case "${PHYSICAL_INTERFACE}" in
|
||||
*phys)
|
||||
;;
|
||||
*)
|
||||
exit 0
|
||||
;;
|
||||
esac
|
||||
|
||||
ADDRESS="$(</sys/class/net/${PHYSICAL_INTERFACE}/address)"
|
||||
rand="$(</proc/sys/kernel/random/uuid)"
|
||||
rand="${rand//-/}"
|
||||
GENERATED_ADDRESS=$(echo "02:${rand:0:2}:${rand:2:2}:${rand:4:2}:${rand:6:2}:${rand:8:2}")
|
||||
|
||||
ip link add link "${PHYSICAL_INTERFACE}" "${VIRTUAL_INTERFACE}" address "${ADDRESS}" type macvlan mode bridge
|
||||
ip link set "${PHYSICAL_INTERFACE}" address "${GENERATED_ADDRESS}"
|
||||
ip link set "${PHYSICAL_INTERFACE}" up
|
||||
@@ -57,16 +57,23 @@ ADDRESS="$(</sys/class/net/${INTERFACE}/address)"
|
||||
for zone in ${ZONES}; do
|
||||
address="${zone}_MACADDR"
|
||||
device="${zone}_DEV"
|
||||
mode="${zone}_MODE"
|
||||
|
||||
# Skip if address or device is unset
|
||||
[ -n "${!address}" -a -n "${!device}" ] || continue
|
||||
|
||||
# Compare MAC addresses
|
||||
[ "${ADDRESS}" = "${!address}" ] || continue
|
||||
|
||||
# If a matching interface has been found we will
|
||||
# print the name to which udev will rename it.
|
||||
if [ "${ADDRESS}" = "${!address}" ]; then
|
||||
if [ "${!mode}" = "macvtap" ]; then
|
||||
echo "${!device}phys"
|
||||
else
|
||||
echo "${!device}"
|
||||
exit 0
|
||||
fi
|
||||
|
||||
exit 0
|
||||
done
|
||||
|
||||
# If we get here we have not found a matching device,
|
||||
|
||||
Reference in New Issue
Block a user