X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=linuxrc;h=441ef54adda2faa5ee6f10db87caa8830b56894b;hb=d1b7d5b4bc51036ee0b961855895d6e0604a0573;hp=eaa4376e72fd4e19948488060eca596f94f1f3f0;hpb=13e0a4fb9bd518ad34d7d27384533d7a7ca1f859;p=grml-terminalserver.git diff --git a/linuxrc b/linuxrc index eaa4376..441ef54 100755 --- a/linuxrc +++ b/linuxrc @@ -2,7 +2,7 @@ # Filename: /linuxrc # Purpose: minirt for kernel 2.6 running on grml live-cd # Authors: (c) Klaus Knopper , (c) Michael Prokop -# Latest change: Don Nov 16 19:08:07 CET 2006 [mika] +# Latest change: Sun Mar 04 13:47:33 CET 2007 ####################################################################################### # hardcoded configurable options @@ -216,6 +216,10 @@ GRML_NAME="GRML" case "$CMDLINE" in *grml_dir=*) GRML_DIR="$grml_dir"; ;; esac case "$CMDLINE" in *grml_name=*) GRML_NAME="$grml_name"; ;; esac +# NFS +for i in $cmdline; do case "$i" in nfsdir=*|NFSDIR=*) eval $i;; esac; done +[ -n "$nfsdir" ] && NFS="$nfsdir" + if [ -n "$DEBUG" ]; then log_begin_msg "Bootoption debug detected. Printing kernel command line:" echo "" @@ -392,7 +396,7 @@ if test -z "$NOUSB"; then if test -f /modules/div/usbcore.ko; then $INSMOD /modules/div/usbcore.ko >/dev/null 2>&1 FOUNDUSB="" - for i in $USB2 uhci-hcd.ko ohci-hcd.ko ; do + for i in $USB2 uhci-hcd.ko ohci-hcd.ko usbhid.ko ; do test -f /modules/div/$i && $INSMOD /modules/div/$i >/dev/null 2>&1 && FOUNDUSB="yes" done if test -n "$FOUNDUSB"; then @@ -419,7 +423,7 @@ fi if test -z "$NOFIREWIRE" ; then log_begin_msg "Checking for Firewire." if test -f /modules/div/ieee1394.ko ; then - $insmoD /modules/div/ieee1394.ko > /dev/null 2>&1 + $INSMOD /modules/div/ieee1394.ko > /dev/null 2>&1 FOUNDFIREWIRE="" test -f /modules/div/ohci1394.ko && $INSMOD /modules/div/ohci1394.ko > /dev/null 2>&1 && FOUNDFIREWIRE="yes" if test -n "$FOUNDFIREWIRE" ; then @@ -508,28 +512,12 @@ esac stage=2 rundebugshell -# NFS -for i in $cmdline; do case "$i" in nfsdir=*|NFSDIR=*) eval $i;; esac; done -[ -n "$nfsdir" ] && NFS="$nfsdir" if [ -n "$NFS" ]; then tmp_="$(getbootparam nfsdir)" log_begin_msg "Bootoption NFS found." ; echo "$SUCCESS" - # put the mylibs into /lib for discover and udhcpc cdir - # starting hw-detection for network card - currently broken, so don't use it - # echo "Starting hw-detection" - # kernel_version_=`uname -r` - # modules_to_load=$(/static/discover --disable-bus all --enable-bus pci --type network --normalize-whitespace --data-path=linux/module/name --data-version=$kernel_version_ | grep -v '^ $' | uniq) - # echo "trying to load the following network modules: \"$modules_to_load\"" - - KERNELVER=`uname -r` - for mod in `find /lib/modules/$KERNELVER/kernel/drivers/net/ -name \*.ko` ; do - echo `basename $mod | sed -e 's/\.ko$//'` >> /modules.load - done - modules_to_load=`cat /modules.load | xargs` - # FIXME modprobe is buggy from busybox log_begin_msg "Trying to load network driver(s)." ; echo modLoad() @@ -539,26 +527,33 @@ if [ -n "$NFS" ]; then if [ $? -ne 0 ]; then continue fi - # be quiet by default, be verbose only with bootoption debuglinuxrc - [ -n "$DEBUG" ] && eval "$tmp_" || eval "$tmp_" 1>/dev/null 2>/dev/null + echo "$tmp_" | while read i; do + # be quiet by default, be verbose only with bootoption debuglinuxrc + [ -n "$DEBUG" ] && eval "$i" || eval "$i" 1>/dev/null 2>/dev/null + done done } - modLoad "$modules_to_load" - rm -f /modules.load + # modules.alias and modules.dep are in place so USE IT :)! + modLoad "$(for x in $(find /sys/devices/ -name modalias); do grep pci: $x; done |xargs)" # loading additional modules modLoad sunrpc lockd af_packet nfs - for INTERFACE in `ifconfig -a | grep '^eth' | sed 's/\ .*//'` ; do + dhcp_iface_=$(getbootparam dhcp_iface) + if [ -z "$dhcp_iface_" ]; then + dhcp_iface_=`ifconfig -a | grep '^eth' | sed 's/ .*//'` + fi + + for INTERFACE in $dhcp_iface_ ; do log_begin_msg "Requesting network configuration using udhcp for ${INTERFACE}:" ; echo - /static/udhcpc --interface="${INTERFACE}" --foreground --quit --script=/static/udhcp-config.sh + /static/timeout 10 /static/udhcpc --interface="${INTERFACE}" --foreground --quit --script=/static/udhcp-config.sh # echo "press to start a system shell and configure your system" # sh done - # recreate the old dir structures + # recreate dir layout + remove extra modules rdir - #rm -rf /myusr /mylib + #rm -rf /mylib log_begin_msg "Looking for GRML in: ${MAGENTA}$NFS${NORMAL}" ; echo "$SUCCESS" if mount -t nfs "$NFS" -o "async,ro,nolock" /cdrom #>/dev/null 2>&1 @@ -808,11 +803,19 @@ then cat /GRML/etc/ld.so.cache > /etc/ld.so.cache UNIONFS="" -$INSMOD /modules/unionfs.ko 1>/dev/null -grep -q unionfs /proc/filesystems && UNIONFS=yes - -# Enable kernel messages -echo "6" > /proc/sys/kernel/printk +if checkbootparam "unionfs" ; then + $INSMOD /modules/unionfs.ko 1>/dev/null + grep -q unionfs /proc/filesystems && UNIONFS=yes + unionfs='unionfs' + UNIONFS_FILETYPE='unionfs' + AUFS='' +else + $INSMOD /modules/aufs.ko 1>/dev/null + grep -q aufs /proc/filesystems && UNIONFS=yes + unionfs='unionfs (using aufs)' + UNIONFS_FILETYPE='aufs' + AUFS='yes' +fi # Set paths log_begin_msg "Setting paths" @@ -850,7 +853,11 @@ FOUNDMEM="$(awk '/MemTotal/{print $2}' /proc/meminfo)" TOTALMEM="$(awk 'BEGIN{m=0};/MemFree|Cached/{m+=$2};END{print m}' /proc/meminfo)" # Be verbose -log_begin_msg "Total memory found: $FOUNDMEM kB" ; echo " $SUCCESS" +if [ -n "$FOUNDMEM" ] ; then + log_begin_msg "Total memory found: $FOUNDMEM kB" ; echo " $SUCCESS" +else + log_failure_msg "Could not fetch memory information." ; echo " $FAILED" +fi # Now we need to use a little intuition for finding a ramdisk size # that keeps us from running out of space, but still doesn't crash the @@ -861,9 +868,9 @@ MINSIZE=20000 # At least this much memory minus 30% should remain when home and var are full. MINLEFT=16000 # Maximum ramdisk size -MAXSIZE="$(expr $TOTALMEM - $MINLEFT)" +[ -n "$TOTALMEM" ] && MAXSIZE="$(expr $TOTALMEM - $MINLEFT)" # Default ramdisk size for ramdisk -RAMSIZE="$(expr $TOTALMEM / 5)" +[ -n "$TOTALMEM" ] && RAMSIZE="$(expr $TOTALMEM / 5)" # Create additional dynamic ramdisk. test -z "$RAMSIZE" -o "$RAMSIZE" -lt "$MINSIZE" && RAMSIZE="$MINSIZE" @@ -878,11 +885,19 @@ mkdir -p /ramdisk/tmp /ramdisk/home/grml && chmod 1777 /ramdisk/tmp && chown grm stage=3 rundebugshell # unionfs -log_begin_msg "Creating unionfs and symlinks on ramdisk" +log_begin_msg "Creating $unionfs and symlinks on ramdisk" mkdir -p /UNIONFS -if test -n "$UNIONFS" && /bin/mount -t unionfs -o noatime${SECURE},dirs=/ramdisk=rw:/GRML=ro /UNIONFS /UNIONFS; then +if test -n "$UNIONFS" && /bin/mount -t $UNIONFS_FILETYPE -o noatime${SECURE},dirs=/ramdisk=rw:/GRML=ro /UNIONFS /UNIONFS ; then # We now have unionfs, copy some data from the initial ramdisk first cp -a /etc/fstab /etc/auto.mnt /etc/filesystems /etc/mtab /UNIONFS/etc/ + + # disable resolvconf on the terminalserver client + if [ -n "$NFS" ] ; then + rm /UNIONFS/etc/resolv.conf + cp -a /etc/resolv.conf /UNIONFS/etc + echo REPORT_ABSENT_SYMLINK=no >> /UNIONFS/etc/default/resolvconf + fi + for i in bin boot etc sbin var lib opt root usr; do # Move directories to unionfs if test -d /$i; then mv /$i /$i.old && \ @@ -892,7 +907,7 @@ if test -n "$UNIONFS" && /bin/mount -t unionfs -o noatime${SECURE},dirs=/ramdisk ln -snf /UNIONFS/$i /$i fi done - echo " $SUCCESS" + [ -n "$AUFS" ] && echo " $SUCCESS" || echo " $SUCCESS" log_begin_msg "Merging read-only system with read-writeable /ramdisk." for i in $(cd /UNIONFS; echo *); do # Create links for new stuff on /UNIONFS test "$i" = "home" -o "$i" = "tmp" && continue @@ -902,8 +917,10 @@ else echo "" log_failure_msg "ERROR: CANNOT UNITE READ-ONLY MEDIA AND INITIAL RAMDISK!" echo "$FAILED" - NOUNIONFS="yes" - /GRML/sbin/halt -f -n + sleep 2 + echo "Can not continue booting, dropping you to a busybox shell." + stage=4 + rundebugshell fi chown grml.grml /home/grml