Changeset 17579 in vbox for trunk/src/VBox/Additions/solaris/Installer

Timestamp:

Mar 9, 2009 2:47:32 PM (16 years ago)

Author:

vboxsync

Message:

Additions/Solaris: Renamed vboxvfs to vboxfs.

Location:

trunk/src/VBox/Additions/solaris/Installer

Files:

• makepackage.sh (modified) (1 diff)
• postinstall.sh (modified) (1 diff)
• vboxguest.sh (modified) (6 diffs)

trunk/src/VBox/Additions/solaris/Installer/makepackage.sh

@@ -81 +81 @@
 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxguest.conf=vboxguest.conf"'    '$3 = "usr/kernel/drv/vboxguest.conf=vboxguest.conf"'
 
-# 32-bit vboxvfs
-#filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxvfs=vboxvfs"'                  '$3 = "usr/kernel/fs/vboxvfs=vboxvfs"; $6="sys"'
-
-# 64-bit vboxvfs
-#filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/amd64/vboxvfs=amd64/vboxvfs"'      '$3 = "usr/kernel/fs/amd64/vboxvfs=amd64/vboxvfs"; $6="sys"'
-
 # vboxvfsmount binary (always 32-bit on combined package)
 filelist_fixup prototype '$3 == "opt/VirtualBoxAdditions/vboxvfsmount=vboxvfsmount"'         '$3 = "etc/fs/vboxvfs/mount=vboxvfsmount"; $6="sys"'

trunk/src/VBox/Additions/solaris/Installer/postinstall.sh

@@ -221 +221 @@
 # Shared Folder kernel module (different for S10 & Nevada)
 osverstr=`uname -r`
-vboxvfsmod="vboxvfs"
-vboxvfsunused="vboxvfs_s10"
+vboxfsmod="vboxfs"
+vboxfsunused="vboxfs_s10"
 if test "$osverstr" = "5.10"; then
-    vboxvfsmod="vboxvfs_s10"
-    vboxvfsunused="vboxvfs"
+    vboxfsmod="vboxfs_s10"
+    vboxfsunused="vboxfs"
 fi
 
 # Move the appropriate module to kernel/fs & remove the unused module name from pkg and file from disk
 # 64-bit shared folder module
-if test -f "$vboxadditions64_path/$vboxvfsmod"; then
-    /usr/sbin/installf -c none $PKGINST "/usr/kernel/fs/$solaris64dir/vboxvfs" f
-    mv -f $vboxadditions64_path/$vboxvfsmod /usr/kernel/fs/$solaris64dir/vboxvfs
-    /usr/sbin/removef $PKGINST $vboxadditions64_path/$vboxvfsmod 1>/dev/null
-    /usr/sbin/removef $PKGINST $vboxadditions64_path/$vboxvfsunused 1>/dev/null
-    rm -f $vboxadditions64_path/$vboxvfsunused
+if test -f "$vboxadditions64_path/$vboxfsmod"; then
+    /usr/sbin/installf -c none $PKGINST "/usr/kernel/fs/$solaris64dir/vboxfs" f
+    mv -f $vboxadditions64_path/$vboxfsmod /usr/kernel/fs/$solaris64dir/vboxfs
+    /usr/sbin/removef $PKGINST $vboxadditions64_path/$vboxfsmod 1>/dev/null
+    /usr/sbin/removef $PKGINST $vboxadditions64_path/$vboxfsunused 1>/dev/null
+    rm -f $vboxadditions64_path/$vboxfsunused
 fi
 
 # 32-bit shared folder module
-if test -f "$vboxadditions_path/$vboxvfsmod"; then
-    /usr/sbin/installf -c none $PKGINST "/usr/kernel/fs/vboxvfs" f
-    mv -f $vboxadditions_path/$vboxvfsmod /usr/kernel/fs/vboxvfs
-    /usr/sbin/removef $PKGINST $vboxadditions_path/$vboxvfsmod 1>/dev/null
-    /usr/sbin/removef $PKGINST $vboxadditions_path/$vboxvfsunused 1>/dev/null
-    rm -f $vboxadditions_path/$vboxvfsunused
+if test -f "$vboxadditions_path/$vboxfsmod"; then
+    /usr/sbin/installf -c none $PKGINST "/usr/kernel/fs/vboxfs" f
+    mv -f $vboxadditions_path/$vboxfsmod /usr/kernel/fs/vboxfs
+    /usr/sbin/removef $PKGINST $vboxadditions_path/$vboxfsmod 1>/dev/null
+    /usr/sbin/removef $PKGINST $vboxadditions_path/$vboxfsunused 1>/dev/null
+    rm -f $vboxadditions_path/$vboxfsunused
 fi
 

trunk/src/VBox/Additions/solaris/Installer/vboxguest.sh

@@ -20 +20 @@
 SILENTUNLOAD=""
 MODNAME="vboxguest"
-VFSMODNAME="vboxvfs"
+VFSMODNAME="vboxfs"
 MODDIR32="/usr/kernel/drv"
 MODDIR64=$MODDIR32/amd64
@@ -69 +69 @@
 }
 
-vboxvfs_loaded()
+vboxfs_loaded()
 {
     module_loaded $VFSMODNAME
@@ -109 +109 @@
 }
 
-start_vboxvfs()
-{
-    if vboxvfs_loaded; then
+start_vboxfs()
+{
+    if vboxfs_loaded; then
         info "VirtualBox FileSystem kernel module already loaded."
     else
         /usr/sbin/modload -p fs/$VFSMODNAME || abort "Failed to load VirtualBox FileSystem kernel module."
-        if test ! vboxvfs_loaded; then
+        if test ! vboxfs_loaded; then
             abort "Failed to load VirtualBox FileSystem kernel module."
         else
@@ -123 +123 @@
 }
 
-stop_vboxvfs()
-{
-    if vboxvfs_loaded; then
-        vboxvfs_mod_id=`/usr/sbin/modinfo | grep $VFSMODNAME | cut -f 1 -d ' ' `
-        if test -n "$vboxvfs_mod_id"; then
-            /usr/sbin/modunload -i $vboxvfs_mod_id || abort "Failed to unload VirtualBox FileSystem module."
+stop_vboxfs()
+{
+    if vboxfs_loaded; then
+        vboxfs_mod_id=`/usr/sbin/modinfo | grep $VFSMODNAME | cut -f 1 -d ' ' `
+        if test -n "$vboxfs_mod_id"; then
+            /usr/sbin/modunload -i $vboxfs_mod_id || abort "Failed to unload VirtualBox FileSystem module."
             info "VirtualBox FileSystem kernel module unloaded."
         fi
@@ -163 +163 @@
 stop_all()
 {
-    stop_vboxvfs
+    stop_vboxfs
     stop_module
     return 0
@@ -195 +195 @@
     ;;
 vfsstart)
-    start_vboxvfs
+    start_vboxfs
     ;;
 vfsstop)
-    stop_vboxvfs
+    stop_vboxfs
     ;;
 *)