Changeset 2068

Timestamp:

09/22/07 08:26:07 (1 year ago)

Author:

alexander

Message:

Added code to handle the rootflafs option to initramfs.
Added nice warnings that catch common errors.
Added /sbin to the PATH of the debugging shell.
Added "ls" to the list of available programs.

Made sure that "generic" IDE drivers are loaded only if "all_generic_ide"
option is present, and only after chipset-specific drivers.

Files:

• trunk/packages/initramfs/Makefile (modified) (2 diffs)
• trunk/packages/initramfs/init.in (modified) (13 diffs)

trunk/packages/initramfs/Makefile

@@ -27 +27 @@
-        cp /etc/udev/rules.d/{05-*,2*,60-*} $(WDIR)/etc/udev/rules.d
-        sed -i 's/, *GROUP="[^"]*"//' $(WDIR)/etc/udev/rules.d/*
+        echo "blacklist generic" >$(WDIR)/etc/modprobe.conf
+        echo "blacklist ata_generic" >>$(WDIR)/etc/modprobe.conf
-        sed -e s/@VERSION@/$(VERSION)/ -e s/@LINKER@/$(LINKER)/ init.in >$(WDIR)/init
-        chmod 755 $(WDIR)/init
@@ -32 +34 @@
-        mknod -m 640 $(WDIR)/dev/console c 5 1
-        mknod -m 664 $(WDIR)/dev/null c 1 3
-
+
+
-        cp /lib/{libblkid.so.1,libc.so.6,libdl.so.2,$(LINKER)} $(WDIR)/lib
-        cp /lib/{libncursesw.so.5,libreadline.so.5,libhistory.so.5} $(WDIR)/lib

trunk/packages/initramfs/init.in

@@ -1 +1 @@
-#!/bin/sh
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+export PATH
-
-EXPECTED_LABEL="lfslivecd-@VERSION@"
@@ -12 +15 @@
-rootfstype=auto
-ro="ro"
+rootflags=
-noresume=0
-resume=
@@ -29 +33 @@
-}
-
+problem() {
+        cat <<"EOF"
+The problem may be caused by the fact that ISA IDE and SCSI adapters are
+no longer attempted to be autodetected. If you use such hardware, load the
+proper driver manually with the "modprobe" command and exit from this shell.
+For old IDE controllers, the correct module name is "ide-generic", or, if
+you want to use the new libata-based driver, "pata-legacy". To avoid this
+message next time you boot this CD, use a kernel command line like this:
+linux load=ide-generic
+
+This problem can be also caused by a slow SCSI controller or USB/FireWire
+CD-ROM that needs more time to be detected. If you see any kernel messages
+below, this is the case. In this case, it is sufficient to type "exit",
+and the CD will continue the boot process. To avoid this message next
+ime you boot this CD, use a kernel command line like this:
+linux rootdelay=20
+
+Dropping you to a shell.
+
+EOF
+        sh
+}
+
-do_resume() {
-        case "$resume" in
@@ -37 +64 @@
-                if [ -b ${resume} ] ; then
-                        eval echo $( stat -L -c '$(( 0x%t )):$(( 0x%T ))' ${resume} ) >/sys/power/resume
+                        # MC syntax highlighting is buggy '
-                else
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                fi
-                ;;
@@ -81 +125 @@
-                bs=1 count=1 skip=8 seek=47482 conv=notrunc 2>/dev/null
-        umount -n /.tmpfs/.cdrom
-/sbin/
+
-        if [ -d /.tmpfs/.partition ] ; then
-/sbin/
+
-                umount -n /.tmpfs/.partition && rm -rf /.tmpfs/.partition
-        fi
@@ -103 +147 @@
-}
-
+
-do_mount_cd() {
-
-
+
-                find_cd
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-                fi
-        done
@@ -143 +166 @@
-        if [ "$toram" = 1 ] ; then copy_cd_to_ram ; fi
-        mount -n -t iso9660 -o ro /dev/lfs-cd /.tmpfs/.cdrom
-/sbin/
-/sbin/
+
+
-        OVERHEAD=$(( 0x1000 + $SIZE * 2 ))
-        OVLSIZE=$(( $SIZE + ( $OVERHEAD + 511 ) / 512 ))
-        dd if=/dev/null of=/.tmpfs/.overlay bs=512 seek=$OVLSIZE 2>/dev/null
-/sbin/
-/sbin/
+
+
-        mount -n -t ext2 /dev/mapper/lfs-cd /.root
-        mount -n --move /.tmpfs /.root/dev/shm
@@ -166 +189 @@
-                rm -f /.root/etc/udev/rules.d/76-network.rules
-        fi
+        ( IFS="," ; for module in $load ; do
+                echo "$module" >>/.root/etc/sysconfig/modules
+        done )
+
-}
-
@@ -173 +200 @@
-        DEVICE=${DEVICE%%:*}
-        mkdir /.tmpfs/.partition
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        ln -sf /dev/loop3 /dev/lfs-cd
-        do_mount_cd
@@ -189 +256 @@
-                do_mount_iso
-                ;;
+        /dev/*)
+                while [ ! -b "$root" ] ; do
+                        cat <<EOF
+The device ${root}, which is supposed to contain the
+root file system, does not exist.
+Please fix this problem and exit this shell.
+
+EOF
+                        problem 
+                done
+                if ! mount -n -t "$rootfstype" -o "$rootflags" "$root" /.root ; then
+                        cat <<EOF
+
+Could not mount device ${root}
+Sleeping forever. Please reboot and fix the kernel command line.
+
+Maybe the device is formatted with an unsupported file system?
+
+Or maybe filesystem type autodetection went wrong, in which case
+you should add the rootfstype=... parameter to the kernel command line.
+
+Available partitions:
+EOF
+                        cat /proc/partitions
+                        while true ; do sleep 10000 ; done
+                fi
+                ;;
-        *:*)
-                ( IFS=":" ; mknod /dev/root b $root )
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                ;;
-        "")
@@ -243 +349 @@
-        rootfstype=*)
-                rootfstype=${param#rootfstype=}
+                ;;
+        rootflags=*)
+                rootflags=${param#rootflags=}
-                ;;
-        ro)
@@ -279 +388 @@
-                done
-                echo "install ata_piix /sbin/modprobe piix ; /sbin/modprobe -i ata_piix" >>/etc/modprobe.conf
-                echo "blacklist ata_generic" >>/etc/modprobe.conf
-                ;;
-        1)
@@ -311 +419 @@
-        echo "options generic all_generic_ide=1" >>/etc/modprobe.conf
-        echo "options ata-generic all_generic_ide=1" >>/etc/modprobe.conf
-
+
+
+
+
+
+
+
+
+
+
+
-        if [ "$PATA" = 0 ] ; then
-echo "blacklist generic" >>/etc/modprobe.conf
+modprobe generic
-        else
-
-
+
+
+
-fi
-
-/sbin/udevd --daemon
-
-( IFS="," ; for module in $load ; do
-        /sbin/modprobe "$module"
-done )
-
-/sbin/udevtrigger
-/sbin/udevsettle
-if [ -n "$rootdelay" ] ; then sleep "$rootdelay" ; fi
-