diff options
| author | Dirk von Suchodoletz | 2009-02-25 06:05:59 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-02-25 06:05:59 +0100 |
| commit | 268f23ce234484ce5c6044f17f703eb0737f0ed7 (patch) | |
| tree | d2cded72c5bf367b3f0d93046fe6449f6d75309b /initramfs/stage3-stuff/bin/servconfig | |
| parent | Added some hints/thoughts of Volkers vbox activities ... (diff) | |
| download | core-268f23ce234484ce5c6044f17f703eb0737f0ed7.tar.gz core-268f23ce234484ce5c6044f17f703eb0737f0ed7.tar.xz core-268f23ce234484ce5c6044f17f703eb0737f0ed7.zip | |
Cleaned up/restructured the mounting of fs components (function
fsmount), removed creation of /dev/rtc (as it is a moving target
in newer distros (25N 0 instead of traditional 10 135) - solution
to be found), earlier start of dbus/hal in Ubuntu.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2639 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/stage3-stuff/bin/servconfig')
| -rwxr-xr-x | initramfs/stage3-stuff/bin/servconfig | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig index 1c4b43cf..3234d915 100755 --- a/initramfs/stage3-stuff/bin/servconfig +++ b/initramfs/stage3-stuff/bin/servconfig @@ -282,12 +282,11 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then *) tmpserv=$(uri_token $scratch server) tmppath=$(uri_token $scratch path) - # check that nfs is available - nfsmod # hanging mount processes might stop further setup - timeout - # should be configured ... it is possible to mount "nolock" only - mount -t nfs -o rw,tcp,nolock,intr,nodev,soft,timeo=2,nosuid \ - ${tmpserv}:${tmppath} /tmp/scratch >/dev/null 2>&1 && { + # should be configured ... + # fsmount proto server path target options + fsmount nfs ${tmpserv} ${temppath} /tmp/scratch \ + "rw,intr,soft,timeo=2,nosuid" && { if [ -d /tmp/scratch/${clientip} ] ; then mv /tmp/scratch/${clientip} /tmp/scratch/${clientip}.totrash rm -rf /tmp/scratch/${clientip}.totrash 2>/dev/null & @@ -295,8 +294,8 @@ if [ -n "$scratch" -a -z "$tmpisdisk" ] ; then testmkd /tmp/scratch/${clientip} # no need for tempfs there ... umount /mnt/tmp >/dev/null 2>&1 - mount -t nfs -o rw,tcp,nolock,intr,nodev,soft,timeo=2,nosuid \ - ${tmpserv}:${tmppath}/${clientip} /mnt/tmp >/dev/null 2>&1 + fsmount nfs ${tmpserv} ${temppath} /mnt/tmp \ + "rw,intr,soft,timeo=2,nosuid" # somehow we need to move it to the vmware plugin. Any ideas # how to handle the dependencies? # create an empty container file for vmware *.vmem, it does not |