Neue Hardwareerkennung im Installer...

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@448 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/config/install/rc b/config/install/rc
index 62c3a593bc5cd7398234609c94478b554a84f9f7..12d7f952d9cdacb7b4928070c918bec98094e675 100644 (file)
--- a/config/install/rc
+++ b/config/install/rc
@@ -1,42 +1,39 @@
 #!/bin/ash
 
-echo "Mounting /tmp"
+echo -n "Mounting filesystems: /tmp "
 mount -n -t tmpfs tmpfs /tmp -o mode=1777
 
-echo "Mounting /proc" 
+echo -n "/proc "
 mount -n -t proc none /proc
+echo >/proc/sys/kernel/printk "1 4 1 7"
 
-echo "Mounting /sys"
+echo -n "/sys "
 mount -n -t sysfs sysfs /sys
 
-echo "Silencing kernel"
-echo >/proc/sys/kernel/printk "1 4 1 7"
+echo -n "/dev "
+mount -n -t tmpfs tmpfs /dev -o mode=755
+mkdir -p -m 0755 /dev/pts
+mkdir -p -m 0755 /dev/shm
 
-echo "Disabling screen blanking"
-echo -n -e "\033[9;0]"
+echo -n "/dev/pts "
+mount -n -t devpts devpts /dev/pts
 
-echo "Mounting /dev"
-mount -n -t tmpfs tmpfs /dev -o mode=755
+echo "/root"
+mount -n -t ramfs none /root
+
+echo -n -e "\033[9;0]"
 
 ln -snf /proc/self/fd /dev/fd
 ln -snf /proc/self/fd/0 /dev/stdin
 ln -snf /proc/self/fd/1 /dev/stdout
 ln -snf /proc/self/fd/2 /dev/stderr
 ln -s /proc/kcore /dev/core
-mkdir -p -m 0755 /dev/pts
-mkdir -p -m 0755 /dev/shm
-
-echo "Mounting /dev/pts"
-mount -n -t devpts devpts /dev/pts
-
-echo "Mounting /root"
-mount -n -t ramfs none /root
 
 echo "Starting syslogd"
 syslogd -O /dev/tty4
 
-echo "Starting udev"
+echo "Starting udev daemon"
 /sbin/udevstart
 
 echo "Loading installer... Please wait!"
-/bin/sleep 5
+/bin/sleep 2

diff --git a/config/syslinux/options.msg b/config/syslinux/options.msg
index 85d2d842ea7d02d94650fd6e89e3179a078c150a..1408c1519da3bc4d53f7540c705fc42481bc5c5a 100644 (file)
--- a/config/syslinux/options.msg
+++ b/config/syslinux/options.msg
@@ -3,12 +3,7 @@
 
                        \ f0fInstaller Boot Options\ f07
 
- -  To disable pcmcia probing, type: \ f04nopcmcia <ENTER>\ f07.  
-
- -  To disable usb probing, type: \ f04nousb <ENTER>\ f07.  
-
- -  To disbale pcmcia probing and usb probing, 
-    type: \ f04nousborpcmcia <ENTER>\ f07.  
+ -  To disable vga mode, type: \ f04novga <ENTER>\ f07.  
 
  -  To enable dma support, type: \ f04dma <ENTER>\ f07.
 
@@ -27,4 +22,9 @@
 
 
 
+
+
+
+
+
 \ f0f[F1-Main] [F2-Options]\ f07

diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg
index 0592f1160325e4d241210be65506a80bdda0bd76..7d5d3319464b35dcbdbd52b85fe289e3600b46fb 100644 (file)
--- a/config/syslinux/syslinux.cfg
+++ b/config/syslinux/syslinux.cfg
@@ -4,22 +4,16 @@ PROMPT 1
 F1 boot.msg
 F2 options.msg
 DEFAULT vmlinuz 
-APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
+  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
 LABEL unattended 
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw unattended
-LABEL nopcmcia
+  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 ro unattended
+LABEL novga
   KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nopcmcia
-LABEL nousb
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb
-LABEL nousborpcmcia
-  KERNEL vmlinuz
-  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb nopcmcia
+  APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 ro
 LABEL dma
   KERNEL vmlinuz
-  APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
+  APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent ro
 LABEL memtest
   KERNEL memtest
   APPEND -

diff --git a/config/uClibc/busybox.config b/config/uClibc/busybox.config
index ddad3075a6a296411c4b4b4971e594800846652d..700e0b48c3237511c1c771be67c6fc898ad7694f 100644 (file)
--- a/config/uClibc/busybox.config
+++ b/config/uClibc/busybox.config
@@ -565,10 +565,10 @@ CONFIG_FEATURE_UDHCP_SYSLOG=y
 # CONFIG_FEATURE_UDHCP_DEBUG is not set
 # CONFIG_VCONFIG is not set
 CONFIG_WGET=y
-# CONFIG_FEATURE_WGET_STATUSBAR is not set
+CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
 # CONFIG_FEATURE_WGET_IP6_LITERAL is not set
-# CONFIG_FEATURE_WGET_LONG_OPTIONS is not set
+CONFIG_FEATURE_WGET_LONG_OPTIONS=y
 # CONFIG_ZCIP is not set
 
 #

diff --git a/doc/packages-list.txt b/doc/packages-list.txt
index 7e855dfb6370811a7ee20f9e625bbc9cfa384f8b..05f96c49b60cbfa1ebc31ecf1ffe007755c6c876 100644 (file)
--- a/doc/packages-list.txt
+++ b/doc/packages-list.txt
@@ -105,7 +105,6 @@
 * htop-0.6.2
 * httpd-2.2.2
 * hwdata-0.191
-* hwinfo-12.29
 * hwinfo-ipfire
 * iana-etc-2.10
 * ibod
@@ -188,7 +187,7 @@
 * openldap-2.3.20
 * openssh-4.3p2
 * openssl-0.9.8d
-* openswan-2.4.7
+* openswan-2.4.8rc1
 * openvpn-2.0.9
 * pam_mysql-0.7RC1
 * patch-2.5.4

diff --git a/html/cgi-bin/connections.cgi b/html/cgi-bin/connections.cgi
index a331ad3bcce685866f0a97aa40a67e08a8403ea2..b38ade0897156be86ce68026664de953df93b5bf 100644 (file)
--- a/html/cgi-bin/connections.cgi
+++ b/html/cgi-bin/connections.cgi
@@ -6,7 +6,7 @@
 #
 # (c) 2006 Franck - add sorting+filtering capability
 #
-# (c) 2006 Peter Schälchli -inetwork (bug)
+# (c) 2006 Peter Schälchli -inetwork (bug)
 #
 
 # Setup GREEN, ORANGE, IPFIRE, VPN CIDR networks, masklengths and colours only once
@@ -405,7 +405,7 @@ my $menu_sort  = &make_select ('SEE_SORT',  $cgiparams{'SEE_SORT'},  @list_sort)
 
 print <<END
 <form method='post' action='$ENV{'SCRIPT_NAME'}'>
-<table width='60%'>
+<table width='100%'>
 <tr><td align='center'><b>$Lang::tr{'legend'} : </b></td>
     <td align='center' bgcolor='${Header::colourgreen}'><b><font color='#FFFFFF'>$Lang::tr{'lan'}</font></b></td>
     <td align='center' bgcolor='${Header::colourred}'><b><font color='#FFFFFF'>$Lang::tr{'internet'}</font></b></td>
@@ -416,17 +416,16 @@ print <<END
     <td align='center' bgcolor='${Header::colourovpn}'><b><font color='#FFFFFF'>$Lang::tr{'OpenVPN'}</font></b></td>
 </tr>
 </table>
-<br />
-<table cellpadding='2'>
-<tr><td align='center'><b>$Lang::tr{'protocol'}</b></td>
-    <td align='center'><b>$Lang::tr{'expires'}<br />($Lang::tr{'seconds'})</b></td>
-    <td align='center'><b>$Lang::tr{'connection'}<br />$Lang::tr{'status'}</b></td>
-    <td align='center'><b>$Lang::tr{'original'}<br />$Lang::tr{'source ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'original'}<br />$Lang::tr{'dest ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'expected'}<br />$Lang::tr{'source ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'expected'}<br />$Lang::tr{'dest ip and port'}</b></td>
-    <td align='center'><b>$Lang::tr{'marked'}</b></td>
-    <td align='center'><b>$Lang::tr{'use'}</b></td>
+<br></br>
+<table width='100%'>
+<tr><td align='center'><font size=2>$Lang::tr{'protocol'}</font></td>
+    <td align='center'><font size=2>$Lang::tr{'expires'}<br></br>($Lang::tr{'seconds'})</font></td>
+    <td align='center'><font size=2>$Lang::tr{'connection'}<br></br>$Lang::tr{'status'}</font></td>
+    <td align='center'><font size=2>$Lang::tr{'original'}<br></br>$Lang::tr{'source ip and port'}</font></td>
+    <td align='center'><font size=2>$Lang::tr{'original'}<br></br>$Lang::tr{'dest ip and port'}</font></td>
+    <td align='center'><font size=2>$Lang::tr{'expected'}<br></br>$Lang::tr{'source ip and port'}</font></td>
+    <td align='center'><font size=2>$Lang::tr{'expected'}<br></br>$Lang::tr{'dest ip and port'}</font></td>
+    <td align='center'><font size=2>$Lang::tr{'marked'}</font></td>
 </tr>
 <tr>
     <td align='center'>$menu_proto</td>
@@ -434,10 +433,16 @@ print <<END
     <td align='center'>$menu_state</td>
     <td align='center'>$menu_src</td>
     <td align='center'>$menu_dest</td>
-    <td align='center'colspan='2'>$Lang::tr{'sort ascending'}:$menu_sort </td>
+    <td align='center' colspan='2'></td>
     <td align='center'>$menu_mark</td>
-    <td align='center'><input type='submit' value='!' /></td>
 </tr>
+<tr>
+    <td align='center' colspan='8'></td>
+</tr>
+<tr>
+    <td align='center' colspan='8'><input type='submit' value='Aktualisieren' /></td>
+</tr>
+
 END
 ;
 
@@ -448,27 +453,26 @@ foreach my $entry (sort sort_entries keys %entries) {
         my $exdipcolour  = &ipcolour( $entries{$entry}->{exdip} );
        print <<END
         <tr bgcolor='${Header::table1colour}'>
-        <td align='center'>$entries{$entry}->{protocol}</td>
-        <td align='center'>$entries{$entry}->{expires}</td>
-        <td align='center'>$entries{$entry}->{status}</td>
+        <td align='center'><font size=2>$entries{$entry}->{protocol}</font></td>
+        <td align='center'><font size=2>$entries{$entry}->{expires}</font></td>
+        <td align='center'><font size=2>$entries{$entry}->{status}</font></td>
         <td align='center' bgcolor='$orgsipcolour'>
             <a href='/cgi-bin/ipinfo.cgi?ip=$entries{$entry}->{orgsip}'>
-            <font color='#FFFFFF'>$entries{$entry}->{orgsip}</font>
-            </a><font color='#FFFFFF'>:$entries{$entry}->{orgsp}</font></td>
+            <font color='#FFFFFF' size=2>$entries{$entry}->{orgsip}</font>
+            </a><font color='#FFFFFF' size=2>:$entries{$entry}->{orgsp}</font></td>
         <td align='center' bgcolor='$orgdipcolour'>
             <a href='/cgi-bin/ipinfo.cgi?ip=$entries{$entry}->{orgdip}'>
-            <font color='#FFFFFF'>$entries{$entry}->{orgdip}</font>
-            </a><font color='#FFFFFF'>:$entries{$entry}->{orgdp}</font></td>
+            <font color='#FFFFFF' size=2>$entries{$entry}->{orgdip}</font>
+            </a><font color='#FFFFFF' size=2>:$entries{$entry}->{orgdp}</font></td>
         <td align='center' bgcolor='$exsipcolour'>
             <a href='/cgi-bin/ipinfo.cgi?ip=$entries{$entry}->{exsip}'>
-            <font color='#FFFFFF'>$entries{$entry}->{exsip}</font>
-            </a><font color='#FFFFFF'>:$entries{$entry}->{exsp}</font></td>
+            <font color='#FFFFFF' size=2>$entries{$entry}->{exsip}</font>
+            </a><font color='#FFFFFF' size=2>:$entries{$entry}->{exsp}</font></td>
         <td align='center' bgcolor='$exdipcolour'>
             <a href='/cgi-bin/ipinfo.cgi?ip=$entries{$entry}->{exdip}'>
-            <font color='#FFFFFF'>$entries{$entry}->{exdip}</font>
-            </a><font color='#FFFFFF'>:$entries{$entry}->{exdp}</font></td>
-        <td align='center'>$entries{$entry}->{marked}</td>
-        <td align='center'>$entries{$entry}->{use}</td>
+            <font color='#FFFFFF' size=2>$entries{$entry}->{exdip}</font>
+            </a><font color='#FFFFFF' size=2>:$entries{$entry}->{exdp}</font></td>
+        <td align='center'><font size=2>$entries{$entry}->{marked}</font></td>
         </tr>
 END
 ;

diff --git a/lfs/hwinfo b/lfs/hwinfo
index 51c330764a58323a3b0a46297cd809e38cf3cc35..1a490226d8398f762050fe99ea1511ae34c70042 100644 (file)
--- a/lfs/hwinfo
+++ b/lfs/hwinfo
@@ -59,7 +59,7 @@ ifeq "$(LFS_PASS)" "install"
        cd $(DIR_APP) && make CC="/opt/$(MACHINE)-uClibc/bin/$(MACHINE)-linux-gcc -I/opt/$(MACHINE)-uClibc/include" \
                EXTRA_FLAGS="-fno-pic -DUCLIBC" \
                SHARED_FLAGS= LIBS="-lhd -lsysfs"
-       install -m 755 hwinfo /install/initrd/sbin
+       cd $(DIR_APP) && install -m 755 hwinfo /install/initrd/sbin
 else
        cd $(DIR_APP) && make tinystatic
        cd $(DIR_APP) && make tinystaticinstall

diff --git a/src/install+setup/install/install.h b/src/install+setup/install/install.h
index ecf122ddf3ac240426e6dc47d8d38db9453ccd8d..c95284c94122fa462c1a47666f508b37b4c17187 100644 (file)
--- a/src/install+setup/install/install.h
+++ b/src/install+setup/install/install.h
@@ -6,8 +6,6 @@
  * (c) Lawrence Manning, 2001
  * Main include file.
  * 
- * $Id: install.h,v 1.10 2004/02/24 21:24:10 alanh Exp $
- * 
  */
 
 #include "../libsmooth/libsmooth.h"

diff --git a/src/install+setup/install/main.c b/src/install+setup/install/main.c
index eb5540a594cfc93c7a121968b62272e22f5509d3..bc3185de0b3d5b9b615eb5040030226db836b285 100644 (file)
--- a/src/install+setup/install/main.c
+++ b/src/install+setup/install/main.c
@@ -253,10 +253,6 @@ int main(int argc, char *argv[])
                fprintf(flog, "Couldn't open commandline: /proc/cmdline\n");
        } else {
                fgets(line, STRING_SIZE, cmdfile);
-               if (strstr (line, "fdisk") != NULL) {
-                       fprintf(flog, "Manual FDISK selected.\n");
-                       fdisk = 1;
-               }
                if (strstr (line, "nousb") == NULL) {
                        fprintf(flog, "Initializing USB controllers.\n");
                        initialize_usb();
@@ -296,10 +292,10 @@ int main(int argc, char *argv[])
 
        newtDrawRootText(14, 0, NAME " " VERSION " - " SLOGAN );
        newtPushHelpLine(ctr[TR_HELPLINE]);
+       sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
 
        if (!unattended) {
                sprintf(message, ctr[TR_WELCOME], NAME);
-               sprintf (title, "%s %s - %s", NAME, VERSION, SLOGAN);
                newtWinMessage(title, ctr[TR_OK], message);
 
                sprintf(message, ctr[TR_SELECT_INSTALLATION_MEDIA_LONG], NAME);

diff --git a/src/install+setup/install/mountsource.sh b/src/install+setup/install/mountsource.sh
index 3d25255d1b826bf620603ac3e1f13c4dfe1cbd37..b30fb15eb4e7e5652cb5c8965ec5b8825fb7cf16 100644 (file)
--- a/src/install+setup/install/mountsource.sh
+++ b/src/install+setup/install/mountsource.sh
@@ -1,14 +1,10 @@
 #!/bin/sh
 
-#
-# to be banished by kudzu!
-#
-
 echo "Scanning source media"
 
 # scan CDROM devices
 
-for DEVICE in $(kudzu -qps  -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | sort | uniq); do
+for DEVICE in $(hwinfo --cdrom | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do
     mount /dev/${DEVICE} /cdrom 2> /dev/null
     if [ -e /cdrom/boot ]; then
        echo -n ${DEVICE} > /tmp/source_device
@@ -18,7 +14,7 @@ for DEVICE in $(kudzu -qps  -t 30 -c CDROM | grep device: | cut -d ' ' -f 2 | so
 done
 
 # scan HD device (usb sticks, etc.)
-for DEVICE in $(kudzu -qps  -t 30 -c HD | grep device: | cut -d ' ' -f 2 | sort | uniq); do
+for DEVICE in $(hwinfo --usb --disk | grep "Device File" | awk -F: '{ print $2 }' | cut -c 7- | sort | uniq); do
     mount /dev/${DEVICE}1 /cdrom 2> /dev/null
     if [ -e /cdrom/boot ]; then
        echo -n ${DEVICE}1 > /tmp/source_device

diff --git a/src/install+setup/install/nic.c b/src/install+setup/install/nic.c
index 0c5c3d545e3e6ce02e2d037fe330ad81cdc541cc..c4eed9629f9b5c32dcc7a4a0f332f618915ee5c2 100644 (file)
--- a/src/install+setup/install/nic.c
+++ b/src/install+setup/install/nic.c
@@ -81,7 +81,7 @@ int networkmenu(struct keyvalue *ethernetkv)
        strcpy(address, ""); findkey(ethernetkv, "GREEN_ADDRESS", address);
        strcpy(netmask, ""); findkey(ethernetkv, "GREEN_NETMASK", netmask);
 
-       snprintf(commandstring, STRING_SIZE, "/bin/ifconfig eth0 %s netmask %s up", 
+       snprintf(commandstring, STRING_SIZE, "/sbin/ifconfig eth0 %s netmask %s up", 
                address, netmask);
        if (mysystem(commandstring))
        {

diff --git a/src/install+setup/install/probehw.sh b/src/install+setup/install/probehw.sh
index 6c9859cdbd96769cb3bbff9b8a1eb1ea61b11775..9ee2e95b550b89fe84fcb3d7cfaed244eba97d0a 100644 (file)
--- a/src/install+setup/install/probehw.sh
+++ b/src/install+setup/install/probehw.sh
@@ -1,11 +1,7 @@
 #!/bin/sh
 
-#
-# to be banished by kudzu!
-#
-
 echo "Detecting Hardware"
-for MODULE in $(kudzu -qps  -t 30 | grep driver | cut -d ' ' -f 2 | sort | uniq); do
+for MODULE in $(hwinfo --all | grep modprobe | awk '{ print $5 }' | tr -d \" | sort | uniq); do
     if [ "${MODULE}" = "unknown" ] || \
         [ "${MODULE}" = "ignore" ]; then
         continue

diff --git a/src/install+setup/install/usb.c b/src/install+setup/install/usb.c
index 444309e9ab6e55a39175d044ccf427a7c2bf1537..826ab1bb973f094655997c5bb9997aeeec2125a8 100644 (file)
--- a/src/install+setup/install/usb.c
+++ b/src/install+setup/install/usb.c
@@ -51,6 +51,7 @@ int initialize_usb() {
        usbuhci = 1;
 
     mysystem("/sbin/modprobe usbhid");
+    mysystem("udevstart");
     return 0;
 }