diff options
author | Dirk von Suchodoletz | 2006-05-23 20:10:46 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-05-23 20:10:46 +0200 |
commit | c1d98237206d7f81a6b14dc8374687dd70527883 (patch) | |
tree | 5561bb91cf7e21ce2f6b75748d6c84109340fc39 /initrd | |
parent | include font cache, otherwise X11 would be rather slow ... (diff) | |
download | core-c1d98237206d7f81a6b14dc8374687dd70527883.tar.gz core-c1d98237206d7f81a6b14dc8374687dd70527883.tar.xz core-c1d98237206d7f81a6b14dc8374687dd70527883.zip |
some fixes ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@232 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
-rw-r--r-- | initrd/distro-specs/suse/functions-9.3 | 4 | ||||
-rwxr-xr-x | initrd/initrd-stuff/init | 2 | ||||
-rwxr-xr-x | initrd/mkdxsinitrd | 35 |
3 files changed, 27 insertions, 14 deletions
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3 index bef659b6..65232855 100644 --- a/initrd/distro-specs/suse/functions-9.3 +++ b/initrd/distro-specs/suse/functions-9.3 @@ -4,7 +4,7 @@ # functions file). This file is the main base for the # following SuSE distributions # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 20-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 22-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # @@ -105,7 +105,7 @@ if [ "x$start_cron" = "xyes" ] ; then echo -e "# /etc/crontab - file generated by $0:\n\ #\t$date\nSHELL=/bin/sh\nPATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/lib/news/bin\ \nMAILTO=\n-*/15 * * * *\troot\ttest -x /usr/lib/cron/run-crons && \ -/usr/lib/cron/run-crons >/dev/null 2>&1\n" >/mnt/etc/crontab +/usr/lib/cron/run-crons >/dev/null 2>&1" >/mnt/etc/crontab else error "$df_errcron" nonfatal fi diff --git a/initrd/initrd-stuff/init b/initrd/initrd-stuff/init index 0d9fb45c..8a4baf73 100755 --- a/initrd/initrd-stuff/init +++ b/initrd/initrd-stuff/init @@ -431,7 +431,7 @@ usbfs\t\t/proc/bus/usb\tusbfs\t\tnoauto\t\t 0 0" >/mnt/etc/fstab || \ error "$init_fstab" echo -e "rootfs / rootfs rw 0 0\ninitramdevs /dev tmpfs rw\ 0 0" > /mnt/etc/mtab -[ -z "$UNIONFS" ] && echo -e "ramfs /tmp tmpfs rw 0 0\nramfs /root\ +[ -z "$UNIONFS" ] && echo -e "ramfs /tmp tmpfs rw 0 0\nramfs /root \ tmpfs rw 0 0\n" >> /mnt/etc/mtab # copy library cache if generated diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd index 1496accb..a87906c6 100755 --- a/initrd/mkdxsinitrd +++ b/initrd/mkdxsinitrd @@ -3,15 +3,19 @@ # Description: universal (distro independent) generator for initial # ramdisks for linux diskless clients # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 03-04-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 23-05-2006 # Nico Dietrich # Felix Endres # -# Version: 0.3.1g +# Version: 0.3.2a # # Copyright: (c) 2003 - 2006 - RZ Universitaet Freiburg +# debug level of script itself DEBUG=1 +# debug level of the initramfs (to trigger the addition of specific +# binaries and kernel modules) +IRFSDEBUG=1 COMETCEXCL="XF86Config*\nissue*\nmtab*\nfstab*\n" COMDIRINDXS="/tmp/scratch /var/lib/nobody" @@ -60,7 +64,7 @@ usage() echo " mkdxsinitrd versucht die aktuellste Kernelversion zu finden." echo " Falls dies nicht klappt, oder eine andere Kernelversion" echo " gewünscht ist kann diese hier angegeben werden (funktioniert" - echo " natürlich nur für auf dem Hostsystem vorhandene Kernelversio‐" + echo " natürlich nur für auf dem Hostsystem vorhandene Kernelversion" echo " nen)." echo " -i Pfad" echo " Optionale Angabe wo die erstellte ramdisk hingeschrieben werden" @@ -74,9 +78,9 @@ usage() echo " -r Pfad" echo " Pfad zum Wurzelverzeichnis des zu exportierenden Betriebsystems" echo " (z.B. /nfsroot)." - echo " -s Bildgröße" - echo " Größenangabe des splash images." - echo " -d Name" + echo " -s screensize (for splash)" + echo " -d debug (add special modules to initramfs)" + echo " -D Name" echo " Name der Distribution der Betriebsystemvorlage" echo " -v Version" echo " Versionskennung der Distribution der Betriebsystemvorlage" @@ -237,7 +241,8 @@ while getopts :hgk:i:r:o:s:f:n:Sut:d:v:I:V:a: a ; do r) echo "-r requires root dir parameter";; s) echo "-s requires image size(s)";; t) echo "-t requires tmp dir parameter";; - d) echo "-d requires linux distribution name";; + d) echo "-d requires debug level (integer)";; + D) echo "-D requires linux Distribution name";; v) echo "-v requires linux distribution version";; I) echo "-I requires network interface parameter";; V) echo "-V requires an executable to run inside linuxrc";; @@ -254,7 +259,8 @@ while getopts :hgk:i:r:o:s:f:n:Sut:d:v:I:V:a: a ; do r) ROOTDIR=$OPTARG;; s) SPLASH=$OPTARG;; t) INSTDIR=$OPTARG;; - d) DISTRO=$OPTARG;; + d) IRFSDEBUG=$OPTARG;; + D) DISTRO=$OPTARG;; v) DISTRO_VER=$OPTARG;; I) NET_IF=$OPTARG;; # Not in use a) acpi_dsdt="$OPTARG";; # Not in use @@ -415,11 +421,13 @@ cobi $tftp bin cp /lib/libnss_files.so.2 ${INSTDIR}/lib # debug binaries -for bbins in \ +if [ $IRFSDEBUG -gt 2 ] ; then + for bbins in \ date lsmod lsof ps strace time do - cobi ${bbins} bin || echo "Program ${bbins} not found" + cobi ${bbins} bin || echo "Program ${bbins} not found" done +fi # style of hotplug/udev/dev (for etc directories see above!!) for bbins in udev udevd udevstart udevtrigger udevsend @@ -499,13 +507,18 @@ fi # define modules to put into initial ramdisk for debugging #DEBUGMODULES="uhci_hcd usbhid" -DEBUGMODULES="" +if [ $IRFSDEBUG -gt 1 ] ; then + DEBUGMODULES="uhci-hcd ohci-hcd usbhid" +else + DEBUGMODULES="" +fi # put all needed modules into initial ramdisk mkdir -p ${INSTDIR}/lib/modules/${KERNVER} for module in af_packet unix ${NWMODULES} ${FSMODULES} ${DEBUGMODULES}; do mod=`cd /${ROOTDIR}; find "lib/modules/${KERNVER}" -name ${module}.ko \ 2>/dev/null` + if [ -n "$mod" ] ; then mpath=${INSTDIR}/${mod%/*} mkdir -p ${mpath} |