From: ms Date: Sat, 2 Jun 2007 22:00:37 +0000 (+0000) Subject: RAID-Erkennung von Sven Nierlein - Danke. X-Git-Tag: v2.3-beta1~655 X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=commitdiff_plain;h=56b548f1466ff22588864fdb6659c75478f72000 RAID-Erkennung von Sven Nierlein - Danke. (Den altbekannten IP-Conntrack-Patch wieder eingebaut.) git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@604 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8 --- diff --git a/doc/language_issues.de b/doc/language_issues.de index 7f3c4de5f7..4efbb96567 100644 --- a/doc/language_issues.de +++ b/doc/language_issues.de @@ -59,6 +59,7 @@ WARNING: translation string unused: cache management WARNING: translation string unused: cache size WARNING: translation string unused: cached memory WARNING: translation string unused: calamaris report interval (in minutes) +WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update @@ -100,11 +101,14 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: disk access per +WARNING: translation string unused: display traffic at home WARNING: translation string unused: dns server WARNING: translation string unused: do not log this port list +WARNING: translation string unused: downlink speed WARNING: translation string unused: download WARNING: translation string unused: dynamic dns client WARNING: translation string unused: editor +WARNING: translation string unused: email server can not be empty WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle @@ -132,6 +136,11 @@ WARNING: translation string unused: firmware WARNING: translation string unused: force update WARNING: translation string unused: free memory WARNING: translation string unused: free swap +WARNING: translation string unused: from email adr +WARNING: translation string unused: from email pw +WARNING: translation string unused: from email server +WARNING: translation string unused: from email user +WARNING: translation string unused: from warn email bad WARNING: translation string unused: gen static key WARNING: translation string unused: generate WARNING: translation string unused: genkey @@ -157,8 +166,10 @@ WARNING: translation string unused: installed WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered +WARNING: translation string unused: invalid downlink speed WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered +WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting WARNING: translation string unused: iowait WARNING: translation string unused: ip address in use @@ -205,11 +216,15 @@ WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modulation WARNING: translation string unused: monthly firewallhits +WARNING: translation string unused: monthly start day bad +WARNING: translation string unused: monthly traffic bad +WARNING: translation string unused: monthly volume start day WARNING: translation string unused: mount WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network configuration WARNING: translation string unused: network status information WARNING: translation string unused: new optionsfw later @@ -263,7 +278,12 @@ WARNING: translation string unused: save error WARNING: translation string unused: sectors read from disk per second WARNING: translation string unused: sectors written to disk per second WARNING: translation string unused: select media +WARNING: translation string unused: send email notification +WARNING: translation string unused: send test mail +WARNING: translation string unused: shaping list options WARNING: translation string unused: shared memory +WARNING: translation string unused: shutdown control +WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload WARNING: translation string unused: squid extension methods @@ -281,17 +301,31 @@ WARNING: translation string unused: system cpu usage WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information WARNING: translation string unused: test +WARNING: translation string unused: test email could not be sent +WARNING: translation string unused: test email was sent WARNING: translation string unused: the following update was successfully installed WARNING: translation string unused: there are updates WARNING: translation string unused: there are updates available WARNING: translation string unused: this is not a valid archive WARNING: translation string unused: this is not an authorised update +WARNING: translation string unused: this months volume WARNING: translation string unused: this update is already installed +WARNING: translation string unused: this weeks volume WARNING: translation string unused: time date manually reset WARNING: translation string unused: title +WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update +WARNING: translation string unused: to warn email bad WARNING: translation string unused: too long 80 char max +WARNING: translation string unused: traffic back +WARNING: translation string unused: traffic calc time +WARNING: translation string unused: traffic calc time bad +WARNING: translation string unused: traffic info messages +WARNING: translation string unused: traffic monitor WARNING: translation string unused: traffic on +WARNING: translation string unused: traffic shaping +WARNING: translation string unused: traffic shaping settings +WARNING: translation string unused: traffic warn level bad WARNING: translation string unused: transfer limits WARNING: translation string unused: transparent on WARNING: translation string unused: umount @@ -301,6 +335,7 @@ WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 +WARNING: translation string unused: uplink speed WARNING: translation string unused: upload static key WARNING: translation string unused: upload update file WARNING: translation string unused: upstream password @@ -319,6 +354,7 @@ WARNING: translation string unused: view log WARNING: translation string unused: vpn on blue WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange +WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week WARNING: translation string unused: weekly firewallhits diff --git a/doc/language_issues.en b/doc/language_issues.en index 8ff0118741..6e10c72ec6 100644 --- a/doc/language_issues.en +++ b/doc/language_issues.en @@ -75,6 +75,7 @@ WARNING: translation string unused: cache management WARNING: translation string unused: cache size WARNING: translation string unused: cached memory WARNING: translation string unused: calamaris report interval (in minutes) +WARNING: translation string unused: calc traffic all x minutes WARNING: translation string unused: capsinactive WARNING: translation string unused: cfg restart WARNING: translation string unused: check for net traffic update @@ -110,10 +111,13 @@ WARNING: translation string unused: dial user password has been changed WARNING: translation string unused: dialup settings WARNING: translation string unused: disconnect WARNING: translation string unused: disk access per +WARNING: translation string unused: display traffic at home WARNING: translation string unused: do not log this port list WARNING: translation string unused: done +WARNING: translation string unused: downlink speed WARNING: translation string unused: dynamic dns client WARNING: translation string unused: editor +WARNING: translation string unused: email server can not be empty WARNING: translation string unused: enable javascript WARNING: translation string unused: enabled on WARNING: translation string unused: enabledtitle @@ -140,6 +144,11 @@ WARNING: translation string unused: firmware WARNING: translation string unused: force update WARNING: translation string unused: free memory WARNING: translation string unused: free swap +WARNING: translation string unused: from email adr +WARNING: translation string unused: from email pw +WARNING: translation string unused: from email server +WARNING: translation string unused: from email user +WARNING: translation string unused: from warn email bad WARNING: translation string unused: g.dtm WARNING: translation string unused: g.lite WARNING: translation string unused: gen static key @@ -168,8 +177,10 @@ WARNING: translation string unused: installed WARNING: translation string unused: intrusion detection system log viewer WARNING: translation string unused: invalid cache size WARNING: translation string unused: invalid date entered +WARNING: translation string unused: invalid downlink speed WARNING: translation string unused: invalid port list WARNING: translation string unused: invalid time entered +WARNING: translation string unused: invalid uplink speed WARNING: translation string unused: invalid upstream proxy username or password setting WARNING: translation string unused: iowait WARNING: translation string unused: ip address in use @@ -216,11 +227,15 @@ WARNING: translation string unused: missing dat WARNING: translation string unused: missing gz WARNING: translation string unused: modulation WARNING: translation string unused: monthly firewallhits +WARNING: translation string unused: monthly start day bad +WARNING: translation string unused: monthly traffic bad +WARNING: translation string unused: monthly volume start day WARNING: translation string unused: mount WARNING: translation string unused: nat-traversal WARNING: translation string unused: net address WARNING: translation string unused: net config type WARNING: translation string unused: net config type help +WARNING: translation string unused: net-traffic configuration WARNING: translation string unused: network configuration WARNING: translation string unused: network status information WARNING: translation string unused: new optionsfw later @@ -268,10 +283,15 @@ WARNING: translation string unused: root user password WARNING: translation string unused: save error WARNING: translation string unused: sectors read from disk per second WARNING: translation string unused: sectors written to disk per second +WARNING: translation string unused: send email notification +WARNING: translation string unused: send test mail WARNING: translation string unused: shaping add options +WARNING: translation string unused: shaping list options WARNING: translation string unused: shared memory WARNING: translation string unused: show areas WARNING: translation string unused: show lines +WARNING: translation string unused: shutdown control +WARNING: translation string unused: shutdown2 WARNING: translation string unused: sitekeyfile WARNING: translation string unused: smbreload WARNING: translation string unused: squid extension methods @@ -287,16 +307,30 @@ WARNING: translation string unused: system cpu usage WARNING: translation string unused: system log viewer WARNING: translation string unused: system status information WARNING: translation string unused: test +WARNING: translation string unused: test email could not be sent +WARNING: translation string unused: test email was sent WARNING: translation string unused: the following update was successfully installed WARNING: translation string unused: there are updates WARNING: translation string unused: there are updates available WARNING: translation string unused: this is not a valid archive WARNING: translation string unused: this is not an authorised update +WARNING: translation string unused: this months volume WARNING: translation string unused: this update is already installed +WARNING: translation string unused: this weeks volume WARNING: translation string unused: time date manually reset WARNING: translation string unused: title +WARNING: translation string unused: to email adr WARNING: translation string unused: to install an update +WARNING: translation string unused: to warn email bad +WARNING: translation string unused: traffic back +WARNING: translation string unused: traffic calc time +WARNING: translation string unused: traffic calc time bad +WARNING: translation string unused: traffic info messages +WARNING: translation string unused: traffic monitor WARNING: translation string unused: traffic on +WARNING: translation string unused: traffic shaping +WARNING: translation string unused: traffic shaping settings +WARNING: translation string unused: traffic warn level bad WARNING: translation string unused: transfer limits WARNING: translation string unused: transparent on WARNING: translation string unused: unencrypted @@ -304,6 +338,7 @@ WARNING: translation string unused: update transcript WARNING: translation string unused: updates WARNING: translation string unused: updates is old1 WARNING: translation string unused: updates is old2 +WARNING: translation string unused: uplink speed WARNING: translation string unused: upload fcdsl.o WARNING: translation string unused: upload static key WARNING: translation string unused: upload update file @@ -323,6 +358,7 @@ WARNING: translation string unused: view log WARNING: translation string unused: vpn on blue WARNING: translation string unused: vpn on green WARNING: translation string unused: vpn on orange +WARNING: translation string unused: warn when traffic reaches WARNING: translation string unused: web proxy configuration WARNING: translation string unused: week WARNING: translation string unused: weekly firewallhits diff --git a/lfs/linux b/lfs/linux index 6907ef8368..69cae1201a 100644 --- a/lfs/linux +++ b/lfs/linux @@ -138,6 +138,9 @@ endif cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.2-r2.tar.gz cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.2-r2/kernel-patches/linux-2.6.16/squashfs3.2-patch + # ip_conntrack permissions from 440 to 444 + cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/ip_conntrack_standalone-patch-for-ipfire.patch + # Patch-o-matic cd $(DIR_SRC) && rm -rf iptables-* patch-o-matic* cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2 diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c index c4c3ba5b72..0bb0b343ee 100644 --- a/src/install+setup/install/main.c +++ b/src/install+setup/install/main.c @@ -82,7 +82,7 @@ int main(int argc, char *argv[]) char *shortlangnames[] = { "de", "en", NULL }; char **langtrs[] = { de_tr, en_tr, NULL }; char hdletter; - char harddrive[5], sourcedrive[5]; /* Device holder. */ + char harddrive[11], sourcedrive[5]; /* Device holder. */ struct devparams hdparams, cdromparams; /* Params for CDROM and HD */ int cdmounted = 0; /* Loop flag for inserting a cd. */ int rc = 0; @@ -101,6 +101,7 @@ int main(int argc, char *argv[]) char title[STRING_SIZE]; int allok = 0; int allok_fastexit=0; + int raid_disk = 0; struct keyvalue *ethernetkv = initkeyvalues(); FILE *handle, *cmdfile; char line[STRING_SIZE]; @@ -258,10 +259,17 @@ int main(int argc, char *argv[]) switch (mysystem("/bin/mountdest.sh") % 255) { case 0: // Found IDE disk scsi_disk = 0; + raid_disk = 0; found = 1; break; case 1: // Found SCSI disk scsi_disk = 1; + raid_disk = 0; + found = 1; + break; + case 2: // Found RAID disk + scsi_disk = 0; + raid_disk= 1; found = 1; break; case 10: // No harddisk found @@ -321,7 +329,7 @@ int main(int argc, char *argv[]) errorbox(ctr[TR_NO_HARDDISK]); goto EXIT; } - fgets(harddrive, 5, handle); + fgets(harddrive, 11, handle); fclose(handle); /* load unattended configuration */ diff --git a/src/install+setup/install/mountdest.sh b/src/install+setup/install/mountdest.sh index af02ccc493..330e5c79a5 100644 --- a/src/install+setup/install/mountdest.sh +++ b/src/install+setup/install/mountdest.sh @@ -36,4 +36,21 @@ for DEVICE in $(kudzu -qps -t 30 -c HD -b SCSI | grep device: | cut -d ' ' -f 2 fi done +# scan RAID devices +echo "--> RAID" +for DEVICE in $(kudzu -qps -t 30 -c HD -b RAID | grep device: | cut -d ' ' -f 2 | sort | uniq); do + echo -n "---> $DEVICE" + mount /dev/${DEVICE}p1 /harddisk 2> /dev/null + if [ -e /harddisk/ipfire-*.tbz2 ]; then + umount /harddisk 2> /dev/null + echo " is source drive" + continue + else + umount /harddisk 2> /dev/null + echo -n "$DEVICE" > /tmp/dest_device + echo " - yes, it is our destination" + exit 2 + fi +done + exit 10 # Nothing found