diff options
author | Dirk von Suchodoletz | 2006-03-24 02:30:14 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-03-24 02:30:14 +0100 |
commit | da149fc84bb701f1705482d224dcab75c3b7dea9 (patch) | |
tree | d47c3a803446abe83f2d20bd2a369a0d0969ad59 /initrd/initrd-stuff/bin | |
parent | installer: rsync again (diff) | |
download | core-da149fc84bb701f1705482d224dcab75c3b7dea9.tar.gz core-da149fc84bb701f1705482d224dcab75c3b7dea9.tar.xz core-da149fc84bb701f1705482d224dcab75c3b7dea9.zip |
integration of vmware module. hw modules to ignore for loading ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@126 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin')
-rwxr-xr-x | initrd/initrd-stuff/bin/hwautocfg | 11 | ||||
-rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 13 |
2 files changed, 20 insertions, 4 deletions
diff --git a/initrd/initrd-stuff/bin/hwautocfg b/initrd/initrd-stuff/bin/hwautocfg index 8a4c5a9e..526e59b6 100755 --- a/initrd/initrd-stuff/bin/hwautocfg +++ b/initrd/initrd-stuff/bin/hwautocfg @@ -4,7 +4,7 @@ # script for linux diskless clients, using hwconfig from # knoppix as base tool # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 21-03-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 24-03-2006 # Blabla # Blub # @@ -277,9 +277,12 @@ fi modprobe ${MODPRV} usbcore & # "drivers" (pseudo, placeholder strings, ...) to exclude from loading -DRIVERLIST=" disabled unknown ignore pcspkr synaptics keybdev" +# depending on distro more hw modules have to be excluded too. use the +# D_HWMODTOIGNORE for that purpose +DRIVERLIST=" disabled unknown ignore pcspkr synaptics keybdev\ + ${D_HWMODTOIGNORE} " # driver blacklist (real modules which fail to load) -DRIVERLIST=${DRIVERLIST}" hw_random ichxrom kanotix genericwheelusb " +DRIVERLIST=${DRIVERLIST}"hw_random kanotix genericwheelusb " # hack for pseudo modules (not to load) for i in $DRIVERLIST ; do echo -e "alias\t$i\tusbcore" >> /etc/modprobe.conf @@ -430,7 +433,7 @@ for hd in $(cat /tmp/hwsetup.info|sed -n -e '/HD$/,/device:/p'| \ sed -n -e "/ 44 /p"|sed -e "s/[[:space:]].*//") ; do # ugly message from ext2 mount :-( ( mkfs.ext2 -q $hdpartnr; mount -n $hdpartnr /mnt/tmp; \ - echo "finished" > /tmp/tmpready ) & + echo "$hdpartnr" > /tmp/tmpready ) & echo -e "$hdpartnr\t/tmp\t\text2\t\tdefaults\t 0 0" >> /mnt/etc/fstab part44=yes break diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 8c8172a8..d7f784c0 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -338,6 +338,19 @@ config_nscd # preparation of /tmp directory (partition 44, nfs scratch, ramdisk) waitfor /tmp/tmpready 10000 # create some directories and correct permissions +tmpisdisk=`sed -n '/\/tmp/p' /mnt/etc/fstab` +# if there is no local disk partition for /tmp then try to mount a rw +# NFS scratch space (if defined in $scratch) and prepared on server +if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then + mkdir -p /tmp/scratch >/dev/null 2>&1 + mount -t nfs -o rw,nolock,intr,nodev,soft,timeo=2,nosuid ${scratch} \ + /tmp/scratch >/dev/null 2>&1 && { + mkdir -p /tmp/scratch/${clientip} >/dev/null 2>&1 + umount /tmp/scratch + mount -t nfs -o rw,nolock,intr,nodev,soft,timeo=2,nosuid \ + ${scratch}/${clientip} /mnt/tmp >/dev/null 2>&1; } +fi +chmod 1777 /mnt/tmp for i in \ /tmp/.ICE-unix \ /tmp/.X11-unix; do testmkd /mnt/$i; done |