mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-26 10:52:57 +02:00
Tripwire-Policy gefixt.
Backupctrl zur ISO gefuegt. Das logger-Tool loggt nicht korrekt in eine Datei. Unser IPSec-restart-Problem mit einem kleinem Patch behoben. Das das ifconfig Fehler liefert nehmen wir IP. Bitte testet dies noch einmal langfristig!!! git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@713 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
@@ -159,8 +159,12 @@ int main(int argc, char *argv[])
|
||||
if (strstr (line, "unattended") != NULL) {
|
||||
unattended = 1;
|
||||
}
|
||||
// Loading the cdrom-filesystem
|
||||
// Loading the cdrom-filesystem and ext2
|
||||
mysystem("/sbin/modprobe iso9660");
|
||||
mysystem("/sbin/modprobe ext2");
|
||||
|
||||
// Loading the via_rhine driver because it isn't detected correctly
|
||||
mysystem("/sbin/modprobe via_rhine");
|
||||
}
|
||||
|
||||
if (unattended) {
|
||||
|
||||
@@ -66,7 +66,10 @@ sub message {
|
||||
|
||||
sub logger {
|
||||
my $log = shift;
|
||||
system("logger -f /var/log/pakfire.log -t pakfire \"$log\"") if "$log";
|
||||
if ($log) {
|
||||
system("echo \"`date`: $log\" >> /var/log/pakfire.log");
|
||||
#system("logger -t pakfire \"$log\"");
|
||||
}
|
||||
}
|
||||
|
||||
sub usage {
|
||||
|
||||
52
src/patches/openswan-2.4.9-startklips-1.patch
Normal file
52
src/patches/openswan-2.4.9-startklips-1.patch
Normal file
@@ -0,0 +1,52 @@
|
||||
--- /usr/lib/ipsec/_startklips_old 2007-07-16 04:14:15.000000000 +0000
|
||||
+++ /usr/lib/ipsec/_startklips 2007-07-19 22:12:37.000000000 +0000
|
||||
@@ -104,23 +104,23 @@
|
||||
|
||||
# figure out ifconfig for interface
|
||||
addr=
|
||||
- eval `ifconfig $phys |
|
||||
- awk '$1 == "inet" && $2 ~ /^addr:/ && $NF ~ /^Mask:/ {
|
||||
- gsub(/:/, " ", $0)
|
||||
- print "addr=" $3
|
||||
- other = $5
|
||||
- if ($4 == "Bcast")
|
||||
- print "type=broadcast"
|
||||
- else if ($4 == "P-t-P")
|
||||
- print "type=pointopoint"
|
||||
- else if (NF == 5) {
|
||||
- print "type="
|
||||
- other = ""
|
||||
- } else
|
||||
- print "type=unknown"
|
||||
- print "otheraddr=" other
|
||||
- print "mask=" $NF
|
||||
- }'`
|
||||
+ eval `ip addr show red0 | awk '$1 == "inet" { gsub(/\//, " ");
|
||||
+ print "addr=" $2;
|
||||
+ print "mask=" $3;
|
||||
+ print "otheraddr=" $5;
|
||||
+ }'`
|
||||
+ eval `ip addr show red0 | awk '$3 ~ /BROADCAST|POINTTOPOINT/ {
|
||||
+ if ($3 ~ /BROADCAST/)
|
||||
+ print "type=broadcast";
|
||||
+ else if ($3 ~ /POINTTOPOINT/)
|
||||
+ print "type=pointtopoint";
|
||||
+ else {
|
||||
+ print "type=";
|
||||
+ print "otheraddr=";
|
||||
+ }
|
||||
+ }'`
|
||||
+ eval `whatmask /$mask | awk -F': ' '$1 ~ /^Netmask =/ { print "mask=" $2 }'`
|
||||
+
|
||||
if test " $addr" = " "
|
||||
then
|
||||
echo "unable to determine address of \`$phys'"
|
||||
@@ -129,7 +129,7 @@
|
||||
if test " $type" = " unknown"
|
||||
then
|
||||
echo "\`$phys' is of an unknown type"
|
||||
- exit 1
|
||||
+ exit 1
|
||||
fi
|
||||
if test " $omtu" != " "
|
||||
then
|
||||
Reference in New Issue
Block a user