From: ms Date: Wed, 14 Mar 2007 21:57:20 +0000 (+0000) Subject: Neue Hardwareerkennung im Installer... X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=4809e64e27463b090e8064b2d16533436c16ee2c 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 62c3a593b..12d7f952d 100644 --- 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 85d2d842e..1408c1519 100644 --- a/config/syslinux/options.msg +++ b/config/syslinux/options.msg @@ -3,12 +3,7 @@ 0fInstaller Boot Options07 - - To disable pcmcia probing, type: 04nopcmcia 07. - - - To disable usb probing, type: 04nousb 07. - - - To disbale pcmcia probing and usb probing, - type: 04nousborpcmcia 07. + - To disable vga mode, type: 04novga 07. - To enable dma support, type: 04dma 07. @@ -27,4 +22,9 @@ + + + + + 0f[F1-Main] [F2-Options]07 diff --git a/config/syslinux/syslinux.cfg b/config/syslinux/syslinux.cfg index 0592f1160..7d5d33194 100644 --- 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 ddad3075a..700e0b48c 100644 --- 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 7e855dfb6..05f96c49b 100644 --- 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 a331ad3bc..b38ade089 100644 --- 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 < - +
@@ -416,17 +416,16 @@ print <$Lang::tr{'OpenVPN'}
$Lang::tr{'legend'} : $Lang::tr{'lan'} $Lang::tr{'internet'}
-
- - - - - - - - - - +

+
$Lang::tr{'protocol'}$Lang::tr{'expires'}
($Lang::tr{'seconds'})		$Lang::tr{'connection'}
$Lang::tr{'status'}		$Lang::tr{'original'}
$Lang::tr{'source ip and port'}		$Lang::tr{'original'}
$Lang::tr{'dest ip and port'}		$Lang::tr{'expected'}
$Lang::tr{'source ip and port'}		$Lang::tr{'expected'}
$Lang::tr{'dest ip and port'}		$Lang::tr{'marked'}$Lang::tr{'use'}
+ + + + + + + + @@ -434,10 +433,16 @@ print <$menu_state - + - + + + + + + + END ; @@ -448,27 +453,26 @@ foreach my $entry (sort sort_entries keys %entries) { my $exdipcolour = &ipcolour( $entries{$entry}->{exdip} ); print < - - - + + + + $entries{$entry}->{orgsip} + :$entries{$entry}->{orgsp} + $entries{$entry}->{orgdip} + :$entries{$entry}->{orgdp} + $entries{$entry}->{exsip} + :$entries{$entry}->{exsp} - - + $entries{$entry}->{exdip} + :$entries{$entry}->{exdp} + END ; diff --git a/lfs/hwinfo b/lfs/hwinfo index 51c330764..1a490226d 100644 --- 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 ecf122ddf..c95284c94 100644 --- 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 eb5540a59..bc3185de0 100644 --- 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 3d25255d1..b30fb15eb 100644 --- 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 0c5c3d545..c4eed9629 100644 --- 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 6c9859cdb..9ee2e95b5 100644 --- 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 444309e9a..826ab1bb9 100644 --- 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; }
$Lang::tr{'protocol'}$Lang::tr{'expires'}

($Lang::tr{'seconds'})		$Lang::tr{'connection'}

$Lang::tr{'status'}		$Lang::tr{'original'}

$Lang::tr{'source ip and port'}		$Lang::tr{'original'}

$Lang::tr{'dest ip and port'}		$Lang::tr{'expected'}

$Lang::tr{'source ip and port'}		$Lang::tr{'expected'}

$Lang::tr{'dest ip and port'}		$Lang::tr{'marked'}
$menu_proto$menu_src $menu_dest$Lang::tr{'sort ascending'}:$menu_sort $menu_mark
$entries{$entry}->{protocol}$entries{$entry}->{expires}$entries{$entry}->{status}$entries{$entry}->{protocol}$entries{$entry}->{expires}$entries{$entry}->{status} - $entries{$entry}->{orgsip} - :$entries{$entry}->{orgsp} - $entries{$entry}->{orgdip} - :$entries{$entry}->{orgdp} - $entries{$entry}->{exsip} - :$entries{$entry}->{exsp} - $entries{$entry}->{exdip} - :$entries{$entry}->{exdp}$entries{$entry}->{marked}$entries{$entry}->{use}$entries{$entry}->{marked}