diff options
author | Dirk von Suchodoletz | 2006-01-20 22:20:37 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-01-20 22:20:37 +0100 |
commit | 7caead1022ee2d8e96ca9be56ddb5be57a86c5c2 (patch) | |
tree | 944a2bc456db8c5d28a691ee90b7660349f396aa | |
parent | Heftiges Bugfixing in mkdxsinitrd ... intensiv gecheckt mit SuSE 10.0 - (diff) | |
download | core-7caead1022ee2d8e96ca9be56ddb5be57a86c5c2.tar.gz core-7caead1022ee2d8e96ca9be56ddb5be57a86c5c2.tar.xz core-7caead1022ee2d8e96ca9be56ddb5be57a86c5c2.zip |
Kleinere Bugs in init und dhcpmkconfig gefixt. boot.ld für initialen
Start via Runlevel angepasst. Weitere Tests durchgeführt mit
verschiedenen Kernel Commandline Parametern ...
git-svn-id: http://svn.openslx.org/svn/openslx/dxs/ld4@30 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r-- | initrd/distro-specs/gentoo/config | 22 | ||||
-rw-r--r-- | initrd/distro-specs/ubuntu/config | 2 | ||||
-rwxr-xr-x | initrd/initrd-stuff/bin/dhcpmkconfig | 4 | ||||
-rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 3 | ||||
-rw-r--r-- | initrd/initrd-stuff/etc/functions | 11 | ||||
-rwxr-xr-x | initrd/initrd-stuff/init | 12 |
6 files changed, 27 insertions, 27 deletions
diff --git a/initrd/distro-specs/gentoo/config b/initrd/distro-specs/gentoo/config index 297d2e10..77716408 100644 --- a/initrd/distro-specs/gentoo/config +++ b/initrd/distro-specs/gentoo/config @@ -1,8 +1,8 @@ # Description: distro specific settings for Gentoo # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 13-12-2005 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 21-01-2006 # -# Copyright: (c) 2003, 2005 - RZ Universitaet Freiburg +# Copyright: (c) 2005,6 - RZ Universitaet Freiburg # D_SYSCONFDIR - system wide configuration settings in /etc - sysconfig in # SuSE and RedHat, default in Debian and Ubuntu, conf.d in Gentoo @@ -18,16 +18,16 @@ # D_RCDIRS - runlevel directories relative to /etc D_SYSCONFDIR=conf.d D_ETCEXCL="opt/gnome/gconf/*\n*.old\n*-\n\ -*.YaST2save\netc/autoinstall\nlogrotate*\nbootloader\n*~\n\ -*.SuSEconfig.saved\npptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\ -X11/xdm/pixmaps\n*.rpmsave\ndhclient.script\ninit.d/boot.d/*\n\ -init.d/rc3.d/*\ninit.d/rc5.d/*" +etc/autoinstall\nlogrotate*\nbootloader\n*~\n\ +pptp.d\nisdn\nyouservers\nhardware/hwcfg*\n\ +X11/xdm/pixmaps\ndhclient.script\nrunlevels/boot/*\n\ +runlevels/default/*\nrunlevels/nonetwork/*" D_BINDMPTS="tmp root home" D_DIRINBINDMNT="/var/run /var/log /var/tmp" D_RODIRSINRW="/var/adm /var/lib/texmf" D_DIRINDXS="/var/X11R6/compose-cache \ -/var/run/sysconfig/tmp /var/adm /var/lib/rpm /var/lib/nobody \ -/var/lib/pam_devperm /var/lib/bluetooth \ +/var/run/sysconfig/tmp /var/lib/init.d/started /var/lib/nobody \ +/var/lib/bluetooth \ /var/lib/texmf /var/lib/nfs/sm /var/lib/nfs/state \ /var/lib/misc /var/lib/acpi /var/spool/cron \ /var/lock/subsys/sysconfig" @@ -35,4 +35,8 @@ D_BINDMNT="# spielspass fuer splash" D_INITDIR="/init.d" D_INITBOOTD="/runlevels/boot" D_RCDIRS="/runlevels/default /runlevels/nonetwork /runlevels/single" -D_INITSCRIPTS="" +D_INITSCRIPTS="bootmisc clock modules urandom" +D_XF86CONFFILE="/etc/X11/xorg.conf" +D_XFONTPATH="/usr/share/fonts/*" +D_DEFAULTCOUNTRY="de" + diff --git a/initrd/distro-specs/ubuntu/config b/initrd/distro-specs/ubuntu/config index a38f1fb0..05cd51b0 100644 --- a/initrd/distro-specs/ubuntu/config +++ b/initrd/distro-specs/ubuntu/config @@ -43,5 +43,5 @@ D_INITBOOTD="/rcS.d" D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d" D_INITSCRIPTS="udev procps.sh bootlogd keymap.sh hwclock.sh sudo" D_XF86CONFFILE="/etc/X11/xorg.conf" -D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*" +D_XFONTPATH="/usr/share/fonts/*" D_DEFAULTCOUNTRY="de" diff --git a/initrd/initrd-stuff/bin/dhcpmkconfig b/initrd/initrd-stuff/bin/dhcpmkconfig index d1bc3dfd..b7dd3cbd 100755 --- a/initrd/initrd-stuff/bin/dhcpmkconfig +++ b/initrd/initrd-stuff/bin/dhcpmkconfig @@ -33,8 +33,8 @@ case $0 in ;; *dhclient*) set | sed -n -e '/^new/p' | sed \ - -e "s,^new_,," -e "s,fixed-address,clientip," \ - -e "s,routers,gateway," -e "s,dhcp-server-identifier,serverip," \ + -e "s,^new_,," -e "s,fixed_address,clientip," \ + -e "s,routers,gateway," -e "s,dhcp_server_identifier,serverip," \ -e "s,.*_t[iy][mp]e.*,," -e "s,.*_message_.*,," -e "/^$/d" \ -e "s,language=,country=," -e "s,ip_address,clientip," \ >>/etc/machine-setup diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 5f782bc5..92c4a232 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -104,6 +104,9 @@ case ${DISTRO} in done ;; gentoo*) + for i in ${D_INITSCRIPTS}; do + ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/$i + done ;; esac diff --git a/initrd/initrd-stuff/etc/functions b/initrd/initrd-stuff/etc/functions index 9418b637..15237680 100644 --- a/initrd/initrd-stuff/etc/functions +++ b/initrd/initrd-stuff/etc/functions @@ -130,8 +130,9 @@ running kernel - see error messages above\n\ for mnt in nfsmount mount none; do test -x /bin/$mnt && break; done -loadmod /lib/modules/@@@KERNVER@@@/kernel/fs/nfs/nfs.ko \ - "needed for mounting rootfs" +[ -f /lib/modules/@@@KERNVER@@@/kernel/fs/nfs/nfs.ko ] && \ + loadmod /lib/modules/@@@KERNVER@@@/kernel/fs/nfs/nfs.ko \ + "needed for mounting rootfs" case $mnt in nfsmount) nfsmount -o ro $nfsroot /mnt || error $errmsg @@ -140,7 +141,6 @@ case $mnt in portmap || error " Portmapper should be present, if normal mount \ command is used. Please\n check your initial ramdisk setup (mkdxsinitrd)." mount -n -t nfs -o ro $nfsroot /mnt || error $errmsg - killall -9 portmap ;; none) @@ -196,8 +196,9 @@ if [ "$dhcp" = "none" ] ; then else # ensure the interface is up ipsetup 0.0.0.0 255.255.255.255 0.0.0.0 255.255.255.255 eth0 & - loadmod /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko \ - "needed for dhcp"; + [ -f /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko ] && \ + loadmod /lib/modules/@@@KERNVER@@@/kernel/net/packet/af_packet.ko \ + "needed for dhcp"; echo "Starting $dhcp for configuration" mkdir /var/lib/dhcp 2>&1 >/dev/null fi diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 0e3111f6..48a9f144 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -231,13 +231,6 @@ filesystem module for the client root\n filesystem ontop of the (D)NBD." esac fi -# if root filesystem should be imported via udp based distributed network -# block device -if [ -n "${DNBDOPT}" ] ; then - modprobe ${MODPRV} dnbd || echo "failed to load dnbd!" - -fi - # if no type of root filesystem is passed via kernel command line try # information gathered from dhcp process if [ -z "${DNBDOPT}" -a -z "${NBDOPT}" -a -z "${NFSROOT}" ] ; then @@ -385,17 +378,16 @@ waitfor /tmp/svcfg 20000 || error " For some reason the software config \ of this client did not finish in\n time. You might check the process list \ and list the modules loaded until\n now." date -bash +#bash # IP configuration is made and should not be updated automatically killall -9 dhcpcd dhclient pump 2>/dev/null # unmount the bind mounted modules directory umount -n /lib/modules/${KERNEL} || error "Unmount of the kernel \ modules directory failed for some reason." -# close script for stuff to execute during early bootup +# close runlevel script for stuff to execute during early bootup d_mkbootld close # reset hotplug echo "/sbin/hotplug" > /proc/sys/kernel/hotplug -echo "" test -f /mnt/etc/inittab || error " The file /etc/inittab does not exist or \ is no regular one. It is needed\n for the bootup procedure to follow." umount -n /sys || error " Unmount of the kernel sys directory \ |