Kernel angepasst.

Bootprozess bearbeitet. Console vorlaeufig auf Deutsch eingestellt bis das Setup geht. git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@358 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-04-09 18:45:54 +02:00 · 2006-12-08 12:41:21 +00:00
parent 231048413c
commit 65998e0a05
16 changed files with 106 additions and 1701 deletions
--- a/config/etc/inputrc
+++ b/config/etc/inputrc
@@ -1,33 +1,42 @@
-# do not bell on tab-completion
-#set bell-style none
+# Begin /etc/inputrc

-set meta-flag on
-set input-meta on
-set convert-meta off
-set output-meta on
+# Allow the command prompt to wrap to the next line
+set horizontal-scroll-mode Off

-$if mode=emacs
+# Enable 8bit input
+set meta-flag On
+set input-meta On

-# for linux console and RH/Debian xterm
+# Turns off 8th bit stripping
+set convert-meta Off
+
+# Keep the 8th bit for display
+set output-meta On
+
+# none, visible or audible
+set bell-style none
+
+# All of the following map the escape sequence of the
+# value contained inside the 1st argument to the
+# readline specific functions
+
+"\eOd": backward-word
+"\eOc": forward-word
+
+# for linux console
 "\e[1~": beginning-of-line
 "\e[4~": end-of-line
 "\e[5~": beginning-of-history
 "\e[6~": end-of-history
 "\e[3~": delete-char
 "\e[2~": quoted-insert
-"\e[5C": forward-word
-"\e[5D": backward-word
-"\e\e[C": forward-word
-"\e\e[D": backward-word

-# for rxvt
-"\e[8~": end-of-line
-
-# for non RH/Debian xterm, can't hurt for RH/DEbian xterm
+# for xterm
 "\eOH": beginning-of-line
 "\eOF": end-of-line

-# for freebsd console
+# for Konsole
 "\e[H": beginning-of-line
 "\e[F": end-of-line
-$endif
+
+# End /etc/inputrc
--- a/config/kernel/kernel.config.i586
+++ b/config/kernel/kernel.config.i586
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16
-# Wed Nov 15 12:49:42 2006
+# Tue Nov 28 17:01:09 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -999,7 +999,7 @@ CONFIG_B44=m
 CONFIG_FORCEDETH=m
 CONFIG_CS89x0=m
 CONFIG_DGRS=m
-# CONFIG_EEPRO100 is not set
+CONFIG_EEPRO100=m
 CONFIG_E100=m
 CONFIG_LNE390=m
 CONFIG_FEALNX=m
@@ -1016,10 +1016,10 @@ CONFIG_8139TOO_8129=y
 CONFIG_SIS900=m
 CONFIG_EPIC100=m
 CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_SUNDANCE_MMIO=y
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_MMIO=y

 #
 # Ethernet (1000 Mbit)
@@ -1494,9 +1494,9 @@ CONFIG_SENSORS_HDAPS=m
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
@@ -1507,7 +1507,7 @@ CONFIG_FB=y
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VESA is not set
+CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -1537,7 +1537,7 @@ CONFIG_VIDEO_SELECT=y
 CONFIG_VGA_CONSOLE=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1546,12 +1546,16 @@ CONFIG_FONT_8x16=y
 #
 # Logo configuration
 #
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set

 #
 # Bootsplash configuration
 #
+# CONFIG_BOOTSPLASH is not set

 #
 # Sound
@@ -1975,7 +1979,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 #
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
-CONFIG_CRC32=m
+CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
--- a/config/kernel/kernel.config.i586.installer
+++ b/config/kernel/kernel.config.i586.installer
--- a/config/kernel/kernel.config.i586.smp
+++ b/config/kernel/kernel.config.i586.smp
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.16
-# Wed Nov 15 12:49:54 2006
+# Tue Nov 28 17:01:34 2006
 #
 CONFIG_X86_32=y
 CONFIG_SEMAPHORE_SLEEPERS=y
@@ -999,7 +999,7 @@ CONFIG_B44=m
 CONFIG_FORCEDETH=m
 CONFIG_CS89x0=m
 CONFIG_DGRS=m
-# CONFIG_EEPRO100 is not set
+CONFIG_EEPRO100=m
 CONFIG_E100=m
 CONFIG_LNE390=m
 CONFIG_FEALNX=m
@@ -1016,10 +1016,10 @@ CONFIG_8139TOO_8129=y
 CONFIG_SIS900=m
 CONFIG_EPIC100=m
 CONFIG_SUNDANCE=m
-# CONFIG_SUNDANCE_MMIO is not set
+CONFIG_SUNDANCE_MMIO=y
 CONFIG_TLAN=m
 CONFIG_VIA_RHINE=m
-# CONFIG_VIA_RHINE_MMIO is not set
+CONFIG_VIA_RHINE_MMIO=y

 #
 # Ethernet (1000 Mbit)
@@ -1489,9 +1489,9 @@ CONFIG_SENSORS_HDAPS=m
 # Graphics support
 #
 CONFIG_FB=y
-# CONFIG_FB_CFB_FILLRECT is not set
-# CONFIG_FB_CFB_COPYAREA is not set
-# CONFIG_FB_CFB_IMAGEBLIT is not set
+CONFIG_FB_CFB_FILLRECT=y
+CONFIG_FB_CFB_COPYAREA=y
+CONFIG_FB_CFB_IMAGEBLIT=y
 # CONFIG_FB_MACMODES is not set
 # CONFIG_FB_MODE_HELPERS is not set
 # CONFIG_FB_TILEBLITTING is not set
@@ -1502,7 +1502,7 @@ CONFIG_FB=y
 # CONFIG_FB_ASILIANT is not set
 # CONFIG_FB_IMSTT is not set
 # CONFIG_FB_VGA16 is not set
-# CONFIG_FB_VESA is not set
+CONFIG_FB_VESA=y
 CONFIG_VIDEO_SELECT=y
 # CONFIG_FB_HGA is not set
 # CONFIG_FB_S1D13XXX is not set
@@ -1532,7 +1532,7 @@ CONFIG_VIDEO_SELECT=y
 CONFIG_VGA_CONSOLE=y
 # CONFIG_MDA_CONSOLE is not set
 CONFIG_DUMMY_CONSOLE=y
-CONFIG_FRAMEBUFFER_CONSOLE=m
+CONFIG_FRAMEBUFFER_CONSOLE=y
 # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set
 # CONFIG_FONTS is not set
 CONFIG_FONT_8x8=y
@@ -1541,12 +1541,16 @@ CONFIG_FONT_8x16=y
 #
 # Logo configuration
 #
-# CONFIG_LOGO is not set
+CONFIG_LOGO=y
+CONFIG_LOGO_LINUX_MONO=y
+CONFIG_LOGO_LINUX_VGA16=y
+CONFIG_LOGO_LINUX_CLUT224=y
 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set

 #
 # Bootsplash configuration
 #
+# CONFIG_BOOTSPLASH is not set

 #
 # Sound
@@ -1972,7 +1976,7 @@ CONFIG_CRYPTO_MICHAEL_MIC=m
 #
 CONFIG_CRC_CCITT=m
 CONFIG_CRC16=m
-CONFIG_CRC32=m
+CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
 CONFIG_ZLIB_DEFLATE=y
--- a/config/kernel/unattended.conf
+++ b/config/kernel/unattended.conf
@@ -9,6 +9,3 @@ GREEN_NETADDRESS=192.168.0.0
 GREEN_BROADCAST=192.168.0.255
 ROOT_PASSWORD=ipfire
 ADMIN_PASSWORD=ipfire
-SERIAL_CONSOLE=yes
-REVERSE_NICS=yes
-MEGABRIDGE=yes
--- a/config/rootfiles/common/kbd
+++ b/config/rootfiles/common/kbd
@@ -1,6 +1,6 @@
 bin/kbd_mode
 bin/loadkeys
-#bin/openvt
+bin/openvt
 bin/setfont
 #lib/kbd
 #lib/kbd/consolefonts
--- a/config/rootfiles/common/nano
+++ b/config/rootfiles/common/nano
@@ -0,0 +1,7 @@
+#etc/nano
+etc/nano/nanorc.sample
+usr/bin/nano
+usr/bin/pico
+#usr/info/nano.info
+#usr/man/man1/nano.1
+#usr/man/man5/nanorc.5
--- a/config/rootfiles/common/nash
+++ b/config/rootfiles/common/nash
@@ -0,0 +1,2 @@
+sbin/mkinitrd
+sbin/nash
--- a/config/rootfiles/common/stage2
+++ b/config/rootfiles/common/stage2
@@ -45,23 +45,23 @@ tmp
 #usr/lib
 #usr/lib/libgcc_s.so
 #usr/lib/libgcc_s.so.1
-#usr/local/bin/connscheduler
-#usr/local/bin/hddshutdown
-#usr/local/bin/hddshutdown-state
-#usr/local/bin/httpscert
-#usr/local/bin/langcache
-#usr/local/bin/makegraphs
+usr/local/bin/connscheduler
+usr/local/bin/hddshutdown
+usr/local/bin/hddshutdown-state
+usr/local/bin/httpscert
+usr/local/bin/langcache
+usr/local/bin/makegraphs
 #usr/local/bin/packager
-#usr/local/bin/qosd
-#usr/local/bin/readhash
-#usr/local/bin/resetusb
-#usr/local/bin/run-parts
-#usr/local/bin/setddns.pl
-#usr/local/bin/setreservedports
-#usr/local/bin/settime
-#usr/local/bin/timecheck
-#usr/local/bin/tunerrd.pl
-#usr/local/bin/vpn-restart
+usr/local/bin/qosd
+usr/local/bin/readhash
+usr/local/bin/resetusb
+usr/local/bin/run-parts
+usr/local/bin/setddns.pl
+usr/local/bin/setreservedports
+usr/local/bin/settime
+usr/local/bin/timecheck
+usr/local/bin/tunerrd.pl
+usr/local/bin/vpn-restart
 #usr/local/include
 #usr/local/lib
 #usr/local/sbin
--- a/lfs/initscripts
+++ b/lfs/initscripts
@@ -50,14 +50,8 @@ md5 :

 $(TARGET) :
 	@$(PREBUILD)
-
-	# Make directories
 	install -d -m 755 /etc/rc.d/rc0.d
-	install -d -m 755 /etc/rc.d/rc1.d
-	install -d -m 755 /etc/rc.d/rc2.d
 	install -d -m 755 /etc/rc.d/rc3.d
-	install -d -m 755 /etc/rc.d/rc4.d
-	install -d -m 755 /etc/rc.d/rc5.d
 	install -d -m 755 /etc/rc.d/rc6.d
 	install -d -m 755 /etc/rc.d/rcsysinit.d
 	install -d -m 755 /etc/rc.d/init.d
@@ -68,17 +62,17 @@ $(TARGET) :
 	done
 	chmod 644 /etc/rc.d/init.d/functions

+	for i in $(DIR_SRC)/src/initscripts/sysconfig/*; do \
+		install -v -m 644 $$i /etc/sysconfig/; \
+	done
+
 	ln -sf ../init.d/sysklogd    /etc/rc.d/rc0.d/K90sysklogd
 	ln -sf ../init.d/sendsignals /etc/rc.d/rc0.d/S60sendsignals
 	ln -sf ../init.d/mountfs     /etc/rc.d/rc0.d/S70mountfs
 	ln -sf ../init.d/swap        /etc/rc.d/rc0.d/S80swap
 	ln -sf ../init.d/localnet    /etc/rc.d/rc0.d/S90localnet
 	ln -sf ../init.d/halt        /etc/rc.d/rc0.d/S99halt
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc1.d/K90sysklogd
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc2.d/K90sysklogd
 	ln -sf ../init.d/sysklogd    /etc/rc.d/rc3.d/S10sysklogd
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc4.d/S10sysklogd
-	ln -sf ../init.d/sysklogd    /etc/rc.d/rc5.d/S10sysklogd
 	ln -sf ../init.d/sysklogd    /etc/rc.d/rc6.d/K90sysklogd
 	ln -sf ../init.d/sendsignals /etc/rc.d/rc6.d/S60sendsignals
 	ln -sf ../init.d/mountfs     /etc/rc.d/rc6.d/S70mountfs
@@ -86,26 +80,15 @@ $(TARGET) :
 	ln -sf ../init.d/localnet    /etc/rc.d/rc6.d/S90localnet
 	ln -sf ../init.d/reboot      /etc/rc.d/rc6.d/S99reboot
 	ln -sf ../init.d/sshd        /etc/rc.d/rc0.d/K30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc1.d/K30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc2.d/K30sshd
 	ln -sf ../init.d/sshd        /etc/rc.d/rc3.d/S30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc4.d/S30sshd
-	ln -sf ../init.d/sshd        /etc/rc.d/rc5.d/S30sshd
 	ln -sf ../init.d/sshd        /etc/rc.d/rc6.d/K30sshd
 	ln -sf ../init.d/apache      /etc/rc.d/rc0.d/K28apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc1.d/K28apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc2.d/K28apache
 	ln -sf ../init.d/apache      /etc/rc.d/rc3.d/S32apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc4.d/S32apache
-	ln -sf ../init.d/apache      /etc/rc.d/rc5.d/S32apache
 	ln -sf ../init.d/apache      /etc/rc.d/rc6.d/K28apache
 	ln -sf ../init.d/fcron       /etc/rc.d/rc0.d/K08fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc1.d/K08fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc2.d/S40fcron
 	ln -sf ../init.d/fcron       /etc/rc.d/rc3.d/S40fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc4.d/S40fcron
-	ln -sf ../init.d/fcron       /etc/rc.d/rc5.d/S40fcron
 	ln -sf ../init.d/fcron       /etc/rc.d/rc6.d/K08fcron
+
 	ln -sf ../init.d/mountkernfs /etc/rc.d/rcsysinit.d/S00mountkernfs
 	ln -sf ../init.d/modules     /etc/rc.d/rcsysinit.d/S05modules
 	ln -sf ../init.d/udev        /etc/rc.d/rcsysinit.d/S10udev
@@ -119,12 +102,6 @@ $(TARGET) :
 	ln -sf ../init.d/localnet    /etc/rc.d/rcsysinit.d/S80localnet
 	ln -sf ../init.d/sysctl      /etc/rc.d/rcsysinit.d/S90sysctl

-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/createfiles /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/modules     /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/rc          /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/clock       /etc/sysconfig/
-	install -m 644 $(DIR_SRC)/src/initscripts/sysconfig/network     /etc/sysconfig/
-
 #	-mkdir -p /etc/rc.d/helper
 #	for i in $(DIR_SRC)/src/rc.d/* ; do \
 #	    if [ -f $$i ]; then \
@@ -139,5 +116,4 @@ $(TARGET) :
 #	chmod -R 755 /etc/rc.d
 #	chgrp nobody /etc/rc.d/rc.red
 #	chmod 4750 /etc/rc.d/rc.red
-
 	@$(POSTBUILD)
--- a/lfs/strip
+++ b/lfs/strip
@@ -63,7 +63,7 @@ ifeq "$(LFS_PASS)" "install"
 	# Don't use --strip-all on libraries, or they'll be destroyed. Don't use --strip-unneeded, either.
 	-/tools/bin/find /lib /usr/lib /usr/share/rrdtool-* /install/initrd/lib \
 		-type f \( -name '*.so' -o -name '*.so[\.0-9]*' \) \
-		-exec /tools/bin/strip --strip-debug {} \; #2>/dev/null
+		-exec /tools/bin/strip --strip-debug {} \; 2>/dev/null

 	-/tools/bin/strip --strip-all /{,usr/}{,local/}{bin,sbin}/* /install/{initrd,misc}/bin/*
 	-/tools/bin/strip --strip-all /usr/lib/awk/{grcat,pwcat}
--- a/make.sh
+++ b/make.sh
@@ -280,6 +280,7 @@ buildbase() {
    lfsmake2 bzip2
    lfsmake2 diffutils
    lfsmake2 e2fsprogs
+    lfsmake2 ed
    lfsmake2 file
    lfsmake2 findutils
    lfsmake2 flex
@@ -297,6 +298,7 @@ buildbase() {
    lfsmake2 man
    lfsmake2 mktemp
    lfsmake2 modutils
+    lfsmake2 net-tools
    lfsmake2 patch
    lfsmake2 psmisc
    lfsmake2 shadow
@@ -312,9 +314,6 @@ buildbase() {
 buildipfire() {
  LOGFILE="$BASEDIR/log/_build.ipfire.log"
  export LOGFILE
-  ipfiremake inetutils
-  ipfiremake net-tools
-  ipfiremake ed
  ipfiremake configroot
  ipfiremake dhcp
  ipfiremake dhcpcd
--- a/src/initscripts/init.d/apache
+++ b/src/initscripts/init.d/apache
@@ -4,15 +4,17 @@
 # Based on sysklogd script from LFS-3.1 and earlier.
 # Rewritten by Gerard Beekmans  - gerard@linuxfromscratch.org

-#$LastChangedBy: bdubbs $
-#$Date: 2005-08-01 14:29:19 -0500 (Mon, 01 Aug 2005) $
-
 . /etc/sysconfig/rc
 . $rc_functions

 case "$1" in
 	start)
 		boot_mesg "Starting Apache daemon..."
+		if [ -f /etc/httpd/server.key -a -f /etc/httpd/server.crt -a -f /etc/httpd/server.csr ]; then
+			/usr/local/bin/httpscert read >/dev/null 2>&1
+		else
+			/usr/local/bin/httpscert new  >/dev/null 2>&1
+		fi
 		/usr/sbin/apachectl -k start
 		evaluate_retval
 		;;
--- a/src/initscripts/sysconfig/console
+++ b/src/initscripts/sysconfig/console
@@ -0,0 +1,7 @@
+# Begin /etc/sysconfig/console
+
+KEYMAP="de-latin1-nodeadkeys"
+KEYMAP_CORRECTIONS="euro2"
+FONT="lat0-16 -m 8859-15"
+
+# End /etc/sysconfig/console
--- a/src/install+setup/install/probecntrl.sh
+++ b/src/install+setup/install/probecntrl.sh
@@ -3,8 +3,8 @@
 echo "Probing for SCSI controllers"
 MODULE=`/bin/kudzu -qps  -t 30 -c SCSI | grep driver | cut -d ' ' -f 2 | sort | uniq`

-if [ "$?" == "0" ]; then
-	echo $MODULE > /cntrldriver;
+if [ "$MODULE" ]; then
+	echo $MODULE > /cntrldriver
 	echo "Your controller is: $MODULE"
 	exit 0
 fi
--- a/src/scripts/httpscert
+++ b/src/scripts/httpscert
@@ -31,7 +31,7 @@ case "$1" in
 		ISSUER=`openssl x509 -in /etc/httpd/server.crt -text -noout | grep Issuer | /usr/bin/cut -f2 -d '='`
 		HOSTNAME=`/bin/hostname -f`
 		if [ "$ISSUER" != "$HOSTNAME" ]; then
-			echo "Certificate issuer '$ISSUER' is not the same as the hostname'$HOSTNAME'"
+			echo "Certificate issuer '$ISSUER' is not the same as the hostname '$HOSTNAME'"
 			echo "Probably host or domain name has been changed in setup"
 			echo "You could remake server certificate with '/usr/local/bin/httpscert new'"
 			exit 1