diff options
author | Dirk von Suchodoletz | 2006-03-25 01:44:23 +0100 |
---|---|---|
committer | Dirk von Suchodoletz | 2006-03-25 01:44:23 +0100 |
commit | 58f6fae954426db04c221be1377786afdccea3f7 (patch) | |
tree | f52d890438648bad9295e7614f6bc9a50620f150 /initrd/initrd-stuff/etc | |
parent | integration of vmware module. hw modules to ignore for loading ... (diff) | |
download | core-58f6fae954426db04c221be1377786afdccea3f7.tar.gz core-58f6fae954426db04c221be1377786afdccea3f7.tar.xz core-58f6fae954426db04c221be1377786afdccea3f7.zip |
move vm-mount into InitRD, heavy cleanups in initial ramdisk
environment, ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@127 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/etc')
-rw-r--r-- | initrd/initrd-stuff/etc/machine-setup | 8 | ||||
-rw-r--r-- | initrd/initrd-stuff/etc/vmware-prep | 25 |
2 files changed, 18 insertions, 15 deletions
diff --git a/initrd/initrd-stuff/etc/machine-setup b/initrd/initrd-stuff/etc/machine-setup index 232d727c..24e754c5 100644 --- a/initrd/initrd-stuff/etc/machine-setup +++ b/initrd/initrd-stuff/etc/machine-setup @@ -85,14 +85,14 @@ netbios_workgroup="dxs-network" # automounter home (/local_dir - top level directories only) and source # (server:/path) automnt_dir="/home" -automnt_src="10.8.4.254:/home" +automnt_src="$serverip:/home" # scratch space on server -scratch="132.230.4.71:/dxs/tmp" +scratch="$serverip:/dxs/tmp" # configure and start vmware services -vmware="yes" -imgsrv="132.230.4.71:/dxs/vmware" +vmware="no" +imgsrv="$serverip:/dxs/vmware" # kind of X11 display manager to run start_xdmcp="xdm" diff --git a/initrd/initrd-stuff/etc/vmware-prep b/initrd/initrd-stuff/etc/vmware-prep index e2eec061..4421a1c5 100644 --- a/initrd/initrd-stuff/etc/vmware-prep +++ b/initrd/initrd-stuff/etc/vmware-prep @@ -1,14 +1,15 @@ #!/bin/sh # -# Description: Adaptation of a generic runlevel script file for use with +# Description: Kernel of a generic runlevel script file for use with # Diskless X Stations (v4.0) - script prepares vmware -# environment +# environment. Start and stop functionality is added within +# initial ramdisk # # Author(s): Michael Janczyk <mj0@uni-freiburg.de>, 23-03-2006 -# Dirk von Suchodoletz <dirk@goe.net>, 08-03-2006 +# Dirk von Suchodoletz <dirk@goe.net>, 25-03-2006 # Copyright: (c) 2003, 2006 - RZ Universitaet Freiburg # -# Version: 0.1a +# Version: 0.1b ################################################################################ @@ -74,13 +75,14 @@ Xpath () { # blabla sessiondinens desktop_session () { echo -e "#!/bin/sh\n#\n# file generated by\n#\t${0}:\n#\t${date}\n - os=\$(echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$1}') - spec=\$(echo \$0 | sed -e \"s,-, ,\" -e \"s,.*/,,\" | awk '{print \$2}')\n + os=\$(echo \$0 | sed -e \"s,-, ,;s,.*/,,\" | awk '{print \$1}') + spec=\$(echo \$0 | sed -e \"s,-, ,;s,.*/,,\" | awk '{print \$2}')\n options=\"-o \${os} \${spec:+\"-s \${spec}\"}\"\n xterm -bg black -fg white -geometry 170x30+0-0 +sb \ -e \"${path}/runvmware \${options} ${debug}\"\n" \ > ${path}/desktop-session + chmod a+x ${path}/desktop-session } @@ -102,10 +104,11 @@ vmsession2desktop_session () { ### START SCRIPT ############################################################### # create vmdir -mkdir -p /var/lib/vmware 2>&1 +#mkdir -p /var/lib/vmware 2>&1 -# mount von zeugs -mount -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid ${imgsrv} ${vmdir} +# mount von zeugs (wohl besser in der InitRD, da sonst Sessions nicht +# rechtzeitig fuer gdm/kdm verfuegbar) +#mount -t nfs -o ro,nolock,intr,nodev,soft,timeo=2,nosuid ${imgsrv} ${vmdir} # device creation - the module does not trigger udev properly vmnet @@ -113,7 +116,7 @@ vmnet # special start script for vmware with predefined image Xpath -# loop file for exchanging information between linux and vmware +# loop file for exchanging information between linux and vmware guest mount_loop # blabla sessiondinens @@ -124,5 +127,5 @@ vmsession2desktop_session -exit 0 +#exit 0 |