webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Bootvorgang des Installers weitergebracht.

Browse Source 
git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@343 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2006-11-08 22:30:51 +00:00
parent 0153429794
commit 3d6e120285
11 changed files with 577 additions and 401 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config/install/fstab
View File

@@ -1,3 +1,6 @@
/dev/ram0 / ext2
/dev/fd0 / ext2
/proc /proc proc
none /sys sysfs
none /tmp tmpfs
none /dev tmpfs

23
config/install/halt
View File

@@ -1,19 +1,18 @@
#!/bin/sh
echo "Shutting down..."
echo "Sending all processes the TERM signal..."
/sbin/killall5 -15
/bin/killall5 -15
sleep 3
echo "Sending all processes the KILL signal..."
/sbin/killall5 -9
/bin/killall5 -9
sleep 3
echo "Unmounting /cdrom, /harddisk/boot, /harddisk/var/log and /harddisk"
/sbin/umount /cdrom
/sbin/umount /harddisk/boot
/sbin/umount /harddisk/var/log
/sbin/umount /harddisk
echo "Unmounting /proc"
/sbin/umount /proc/bus/usb
/sbin/umount /proc
echo "Unmounting filesystems"
/bin/umount /tmp
/bin/umount /sys
/bin/umount /dev/pts
/bin/umount /dev
/bin/umount /root
/bin/umount /proc
echo "Unmounting root"
/sbin/mount -n -o remount,ro /
/sbin/reboot -i -d -p
/bin/mount -n -o remount,ro /
/bin/reboot

1
config/install/inittab
View File

@@ -3,6 +3,7 @@
# Run gettys in standard runlevels
tty1::respawn:/bin/iowrap /dev/tty1 /bin/ash --login -c "/bin/install /dev/tty2"
tty2::respawn:/bin/iowrap /dev/tty2 /bin/ash --login
tty3::respawn:/bin/iowrap /dev/tty3 /bin/ash --login
# Stuff to do before rebooting

35
config/install/rc
View File

@@ -1,12 +1,39 @@
#!/bin/ash
echo "Mounting proc"
mount /proc
echo "Starting syslogd"
syslogd -L -O /dev/tty2
echo "Mounting /tmp"
mount -n -t tmpfs tmpfs /tmp -o mode=1777
echo "Mounting /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 "Mounting /dev"
mount -n -t tmpfs tmpfs /dev -o mode=755
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"
/sbin/udevstart

141
config/install/udev/rules.d/25-lfs.rules Normal file
View File

@@ -0,0 +1,141 @@
# /etc/udev/rules.d/25-lfs.rules: Rule definitions for LFS.
# Create the /dev/cdrom symlink.
BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
# Core kernel devices
KERNEL="ptmx", GROUP="tty", MODE="0666"
KERNEL="random", MODE="0444"
KERNEL="urandom", MODE="0444"
KERNEL="kmem", GROUP="kmem", MODE="0640"
KERNEL="mem", GROUP="kmem", MODE="0640"
KERNEL="port", GROUP="kmem", MODE="0640"
KERNEL="null", MODE="0666"
KERNEL="zero", MODE="0666"
KERNEL="full", MODE="0666"
KERNEL="aio", MODE="0444"
KERNEL="kmsg", MODE="0600"
KERNEL="rtc", MODE="0666"
# Comms devices
KERNEL="ttyS[0-9]*", GROUP="dialout"
KERNEL="ttyUSB[0-9]*", GROUP="dialout"
KERNEL="rfcomm[0-9]*", GROUP="dialout"
KERNEL="tty[BCDEFHILMPRSTUVWX][0-9]*", GROUP="dialout"
KERNEL="ttyS[ACIR][0-9]*", GROUP="dialout"
KERNEL="ttyUSB[0-9]*", GROUP="dialout"
KERNEL="ttyACM[0-9]*", GROUP="dialout"
KERNEL="ippp[0-9]*", GROUP="dialout"
KERNEL="isdn[0-9]*", GROUP="dialout"
KERNEL="isdnctrl[0-9]*", GROUP="dialout"
KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20"
KERNEL="capi*", NAME="capi/%n", GROUP="dialout"
KERNEL="dcbri[0-9]*", GROUP="dialout"
KERNEL="ircomm[0-9]*", GROUP="dialout"
# TTY's
KERNEL="tty", GROUP="tty", MODE="0666"
KERNEL="tty[0-9]*", GROUP="tty", MODE="0666"
KERNEL="vcs*", MODE="0600"
KERNEL="console", GROUP="tty", MODE="0622"
# ALSA devices go in their own subdirectory
KERNEL="controlC[0-9]*", NAME="snd/%k", GROUP="audio"
KERNEL="hw[CD0-9]*", NAME="snd/%k", GROUP="audio"
KERNEL="pcm[CD0-9cp]*", NAME="snd/%k", GROUP="audio"
KERNEL="midiC[D0-9]*", NAME="snd/%k", GROUP="audio"
KERNEL="timer", NAME="snd/%k", GROUP="audio"
KERNEL="seq", NAME="snd/%k", GROUP="audio"
# Sound devices
KERNEL="admmidi*", GROUP="audio"
KERNEL="adsp*", GROUP="audio"
KERNEL="aload*", GROUP="audio"
KERNEL="amidi*", GROUP="audio"
KERNEL="amixer*", GROUP="audio"
KERNEL="audio*", GROUP="audio"
KERNEL="dmfm*", GROUP="audio"
KERNEL="dmmidi*", GROUP="audio"
KERNEL="dsp*", GROUP="audio"
KERNEL="midi*", GROUP="audio"
KERNEL="mixer*", GROUP="audio"
KERNEL="music", GROUP="audio"
KERNEL="sequencer*", GROUP="audio"
# Printing devices
KERNEL="lp[0-9]*", GROUP="lp"
KERNEL="parport[0-9]*", GROUP="lp"
KERNEL="irlpt[0-9]*", GROUP="lp"
# Input devices go in their own subdirectory
KERNEL="mice", NAME="input/%k", MODE="0644"
KERNEL="mouse*", NAME="input/%k", MODE="0644", SYMLINK="mouse"
KERNEL="event*", NAME="input/%k", MODE="0644"
KERNEL="js*", NAME="input/%k", MODE="0644"
KERNEL="ts*", NAME="input/%k", MODE="0644"
KERNEL="psaux", MODE="0644"
KERNEL="js", MODE="0644"
KERNEL="djs", MODE="0644"
# USB devices go in their own subdirectory
KERNEL="hiddev*", NAME="usb/%k"
KERNEL="auer*", NAME="usb/%k"
KERNEL="legousbtower*", NAME="usb/%k"
KERNEL="dabusb*", NAME="usb/%k"
BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k", GROUP="lp"
# DRI devices go in their own subdirectory for FHS compliance
KERNEL="card*", NAME="dri/card%n", GROUP="video"
# Video devices
KERNEL="fb[0-9]*", GROUP="video", MODE="0620"
KERNEL="agpgart", GROUP="video"
KERNEL="nvidia[0-9]*", GROUP="video"
KERNEL="nvidiactl", GROUP="video"
KERNEL="video[0-9]*", GROUP="video"
KERNEL="radio[0-9]*", GROUP="video"
KERNEL="vbi[0-9]*", GROUP="video"
KERNEL="vtx[0-9]*", GROUP="video"
# Storage/memory devices
KERNEL="fd[0-9]*", GROUP="disk" SYMLINK="floppy"
KERNEL="ram[0-9]*", GROUP="disk"
KERNEL="raw[0-9]*", NAME="raw/%k", GROUP="disk"
KERNEL="hd*", GROUP="disk"
KERNEL="sd[a-z]", GROUP="disk"
KERNEL="sd[a-z][0-9]*", GROUP="disk"
KERNEL="sd[a-i][a-z]", GROUP="disk"
KERNEL="sd[a-i][a-z][0-9]*", GROUP="disk"
KERNEL="sr[0-9]*", GROUP="burning" MODE="0664"
KERNEL="s[gt][0-9]*", GROUP="disk"
KERNEL="scd[0-9]*", GROUP="cdrom"
KERNEL="dasd[0-9]*", GROUP="disk"
KERNEL="ataraid[0-9]*", GROUP="disk"
KERNEL="loop[0-9]*", GROUP="disk"
KERNEL="md[0-9]*", GROUP="disk"
KERNEL="dm-*", GROUP="disk", MODE="0640"
KERNEL="ht[0-9]*", GROUP="tape"
KERNEL="nht[0-9]*", GROUP="tape"
KERNEL="pt[0-9]*", GROUP="tape"
KERNEL="npt[0-9]*", GROUP="tape"
KERNEL="st[0-9]*", GROUP="tape"
KERNEL="nst[0-9]*", GROUP="tape"
KERNEL="iseries/vcd*", GROUP="disk"
KERNEL="iseries/vd*", GROUP="disk"
# Network devices
KERNEL="tun", NAME="net/%k"

47
config/install/udev/rules.d/50-udev.rules Normal file
View File

@@ -0,0 +1,47 @@
# There are a number of modifiers that are allowed to be used in some of the
# fields. See the udev man page for a full description of them.
#
# See the udev.rules.examples file for more examples of how to create rules
#
# if this is a ide cdrom, name it the default name, and create a symlink to cdrom
BUS="ide", KERNEL="*[!0-9]", PROGRAM="/bin/cat /proc/ide/%k/media", RESULT="cdrom", NAME="%k", SYMLINK="cdrom"
# create a symlink named after the device map name
# note devmap_name comes with extras/multipath
KERNEL="dm-[0-9]*", PROGRAM="/sbin/devmap_name %M %m", NAME="%k", SYMLINK="%c"
# DRI devices always go into a subdirectory (as per the LSB spec)
KERNEL="card*", NAME="dri/card%n"
# alsa devices
KERNEL="controlC[0-9]*", NAME="snd/%k"
KERNEL="hw[CD0-9]*", NAME="snd/%k"
KERNEL="pcm[CD0-9cp]*", NAME="snd/%k"
KERNEL="midiC[D0-9]*", NAME="snd/%k"
KERNEL="timer", NAME="snd/%k"
KERNEL="seq", NAME="snd/%k"
# input devices
KERNEL="mice", NAME="input/%k"
KERNEL="mouse*", NAME="input/%k"
KERNEL="event*", NAME="input/%k"
KERNEL="js*", NAME="input/%k"
KERNEL="ts*", NAME="input/%k"
# USB devices
KERNEL="hiddev*", NAME="usb/%k"
KERNEL="auer*", NAME="usb/%k"
KERNEL="legousbtower*", NAME="usb/%k"
KERNEL="dabusb*", NAME="usb/%k"
BUS="usb", KERNEL="lp[0-9]*", NAME="usb/%k"
# CAPI devices
KERNEL="capi", NAME="capi20", SYMLINK="isdn/capi20"
KERNEL="capi*", NAME="capi/%n"
# Network devices
KERNEL="tun", NAME="net/%k"
# raw devices
KERNEL="raw[0-9]*", NAME="raw/%k"

3
config/install/udev/udev.conf Normal file
View File

@@ -0,0 +1,3 @@
udev_root="/dev"
udev_db="/dev/.udevdb"
udev_rules="/etc/udev/rules.d/"

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

@@ -7,8 +7,6 @@
* Contains some functs for scanning /proc for ide info on CDROMS and
* harddisks.
*
* $Id: ide.c,v 1.4 2003/12/11 11:25:53 riddles Exp $
*
*/
#include "install.h"

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

@@ -6,8 +6,6 @@
* (c) Lawrence Manning, 2001
* Contains main entry point, and misc functions.
*
* $Id: main.c,v 1.63.2.57 2005/09/25 19:57:46 gespinasse Exp $
*
*/
#include "install.h"
@@ -24,26 +22,8 @@ char **ctr;
char *pcmcia = NULL;
extern char url[STRING_SIZE];
extern char *bz_tr[];
extern char *cs_tr[];
extern char *da_tr[];
extern char *en_tr[];
extern char *es_tr[];
extern char *fi_tr[];
extern char *fr_tr[];
extern char *hu_tr[];
extern char *la_tr[];
extern char *nl_tr[];
extern char *de_tr[];
extern char *tr_tr[];
extern char *it_tr[];
extern char *el_tr[];
extern char *pl_tr[];
extern char *pt_tr[];
extern char *so_tr[];
extern char *sv_tr[];
extern char *no_tr[];
extern char *vi_tr[];
int main(int argc, char *argv[])
{
@@ -51,10 +31,6 @@ int main(int argc, char *argv[])
char *langnames[] = { "English", NULL };
char *shortlangnames[] = { "en", NULL };
char **langtrs[] = { en_tr, NULL };
#elifdef LANG_ALL
char *langnames[] = { "Brasil", "Cestina", "Dansk", "Deutsch", "English", "Español", "Français", "Hellenic", "Italiano", "Spanish Latino", "Magyar", "Nederlands", "Norsk", "Polski", "Português", "Soomali", "Suomi", "Svenska", "Türkçe", "Tieng Viet", NULL };
char *shortlangnames[] = { "bz", "cs", "da", "de", "en", "es", "fr", "el", "it", "la", "hu", "nl", "no", "pl", "pt", "so", "fi", "sv", "tr", "vi", NULL };
char **langtrs[] = { bz_tr, cs_tr, da_tr, de_tr, en_tr, es_tr, fr_tr, el_tr, it_tr, la_tr, hu_tr, nl_tr, no_tr, pl_tr, pt_tr, so_tr, fi_tr, sv_tr, tr_tr, vi_tr, NULL };
#else
char *langnames[] = { "Deutsch", "English", NULL };
char *shortlangnames[] = { "de", "en", NULL };
@@ -162,28 +138,12 @@ int main(int argc, char *argv[])
/* No need to ask. "choice" already has the index for English */
#else
rc = newtWinMenu("Language selection",
"Select the language you wish to use for the " NAME ".", 50, 5, 5, 8,
langnames, &choice, "Ok", NULL);
"Select the language you wish to use for your " NAME ".", 50, 5, 5, 8,
langnames, &choice, "OK", NULL);
#endif
ctr = langtrs[choice];
strcpy(shortlangname, shortlangnames[choice]);
if (strcmp(shortlangname, "el") == 0)
mysystem("/bin/setfont iso07u-16");
else if (strcmp(shortlangname, "pt") == 0)
mysystem("/bin/setfont lat1-16");
else if (strcmp(shortlangname, "bz") == 0)
mysystem("/bin/setfont lat1-16");
else if (strcmp(shortlangname, "cs") == 0)
mysystem("/bin/setfont lat2-16");
else if (strcmp(shortlangname, "hu") == 0)
mysystem("/bin/setfont lat2-16");
else if (strcmp(shortlangname, "pl") == 0)
mysystem("/bin/setfont lat2-16");
else if (strcmp(shortlangname, "tr") == 0)
mysystem("/bin/setfont lat5-16");
else if (strcmp(shortlangname, "vi") == 0)
mysystem("/bin/setfont viscii10-8x16");
else
mysystem("/bin/setfont lat0-16");
newtDrawRootText(14, 0, NAME " v" VERSION " - " SLOGAN );

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

@@ -17,8 +17,6 @@
*
* Copyright 2002: Mark Wormgoor <mark@wormgoor.com>
*
* $Id: usb.c,v 1.9.2.3 2004/11/16 22:48:43 alanh Exp $
*
*/
#include "install.h"
@@ -37,23 +35,22 @@ int initialize_usb() {
ehcihcd = 0;
}
if (usbohci) {
mysystem("/sbin/rmmod usb-ohci");
mysystem("/sbin/rmmod ohci-hcd");
usbohci = 0;
}
if (usbuhci) {
mysystem("/sbin/rmmod usb-uhci");
mysystem("/sbin/rmmod uhci-hcd");
usbuhci = 0;
}
if (mysystem("/sbin/modprobe ehci-hcd") == 0)
ehcihcd = 1;
if (mysystem("/sbin/modprobe usb-ohci") == 0)
if (mysystem("/sbin/modprobe ohci-hcd") == 0)
usbohci = 1;
if (mysystem("/sbin/modprobe usb-uhci") == 0)
if (mysystem("/sbin/modprobe uhci-hcd") == 0)
usbuhci = 1;
mysystem("/sbin/modprobe hid");
mysystem("/sbin/modprobe keybdev");
mysystem("/sbin/modprobe usbhid");
return 0;
}
@@ -79,17 +76,17 @@ int write_usb_modules_conf() {
if (usbohci) {
if (index)
fprintf(handle,"alias usb-controller%d usb-ohci\n",index);
fprintf(handle,"alias usb-controller%d ohci-hcd\n",index);
else
fprintf(handle,"alias usb-controller usb-ohci\n");
fprintf(handle,"alias usb-controller ohci-hcd\n");
index++;
}
if (usbuhci) {
if (index)
fprintf(handle,"alias usb-controller%d usb-uhci\n",index);
fprintf(handle,"alias usb-controller%d uhci-hcd\n",index);
else
fprintf(handle,"alias usb-controller usb-uhci\n");
fprintf(handle,"alias usb-controller uhci-hcd\n");
index++;
}
fclose(handle);

2
src/install+setup/libsmooth/main.c
View File

@@ -311,7 +311,7 @@ int replace(char filename1[], char *from, char *to)
#include "lang_en.c"
#endif
// returns a pointer to the actual running version number of IPCop.
// returns a pointer to the actual running version number of IPFire.
// Successive updates increase effective version but not VERSION !
char g_title[STRING_SIZE] = "";
char* get_version(void) {