webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

Neue Hardwareerkennung im Installer...

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@448 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-03-14 21:57:20 +00:00
parent 76dd79d156
commit 4809e64e27
13 changed files with 70 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
config/install/rc
View File

@@ -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 "Mounting /sys"
mount -n -t sysfs sysfs /sys
echo "Silencing kernel"
echo >/proc/sys/kernel/printk "1 4 1 7"
echo "Disabling screen blanking"
echo -n -e "\033[9;0]"
echo -n "/sys "
mount -n -t sysfs sysfs /sys
echo "Mounting /dev"
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 -n "/dev/pts "
mount -n -t devpts devpts /dev/pts
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

12
config/syslinux/options.msg
View File

@@ -3,12 +3,7 @@
0fInstaller Boot Options07
- To disable pcmcia probing, type: 04nopcmcia <ENTER>07.
- To disable usb probing, type: 04nousb <ENTER>07.
- To disbale pcmcia probing and usb probing,
type: 04nousborpcmcia <ENTER>07.
- To disable vga mode, type: 04novga <ENTER>07.
- To enable dma support, type: 04dma <ENTER>07.
@@ -27,4 +22,9 @@
0f[F1-Main] [F2-Options]07

16
config/syslinux/syslinux.cfg
View File

@@ -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 -

4
config/uClibc/busybox.config
View File

@@ -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
#

3
doc/packages-list.txt
View File

@@ -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

60
html/cgi-bin/connections.cgi
View File

@@ -6,7 +6,7 @@
#
# (c) 2006 Franck - add sorting+filtering capability
#
# (c) 2006 Peter Schälchli -inetwork (bug)
# (c) 2006 Peter Sch<EFBFBD>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
;

2
lfs/hwinfo
View File

@@ -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

2
src/install+setup/install/install.h
View File

@@ -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"

6
src/install+setup/install/main.c
View File

@@ -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);

8
src/install+setup/install/mountsource.sh
View File

@@ -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

2
src/install+setup/install/nic.c
View File

@@ -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))
{

6
src/install+setup/install/probehw.sh
View File

@@ -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

1
src/install+setup/install/usb.c
View File

@@ -51,6 +51,7 @@ int initialize_usb() {
usbuhci = 1;
mysystem("/sbin/modprobe usbhid");
mysystem("udevstart");
return 0;
}