Changeset 15937 in vbox

Timestamp:

Jan 14, 2009 12:48:54 PM (16 years ago)

Author:

vboxsync

Message:

Solaris/Installer: zone fixes for #3381 (combined package).

Location:

trunk/src/VBox/Installer/solaris

Files:

• makepackage.sh (modified) (3 diffs)
• postinstall.sh (modified) (2 diffs)

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

@@ -82 +82 @@
 }
 
+hardlink_fixup()
+{
+  "$VBOX_AWK" 'NF == 3 && $1=="l" && '"$2"' { '"$3"' } { print }' "$1" > "tmp-$1"
+  mv -f "tmp-$1" "$1"
+}
+
 # prepare file list
 cd "$VBOX_INSTALLED_DIR"
@@ -91 +97 @@
     echo 'i copyright=./vbox.copyright' >> prototype
 fi
+
+# Relative hardlinks
+ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxManage
+ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxSDL
+ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/vboxwebsrv
+ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/webtest
+ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxZoneAccess
+if test -f $VBOX_INSTALLED_DIR/amd64/VirtualBox || test -f $VBOX_INSTALLED_DIR/i386/VirtualBox; then
+    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VirtualBox
+fi
+if test -f $VBOX_INSTALLED_DIR/amd64/VBoxBFE || test -f $VBOX_INSTALLED_DIR/i386/VBoxBFE; then
+    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxBFE
+fi
+if test -f $VBOX_INSTALLED_DIR/amd64/VBoxHeadless || test -f $VBOX_INSTALLED_DIR/i386/VBoxHeadless; then
+    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxHeadless
+    ln -f ./VBoxISAExec $VBOX_INSTALLED_DIR/VBoxVRDP
+fi
+
 find . -print | $VBOX_GGREP -v -E 'prototype|makepackage.sh|vbox.pkginfo|postinstall.sh|preremove.sh|ReadMe.txt|vbox.space|vbox.copyright|VirtualBoxKern' | pkgproto >> prototype
 
@@ -96 +120 @@
 filelist_fixup prototype '$2 == "none"'                                                                 '$5 = "root"; $6 = "bin"'
 filelist_fixup prototype '$2 == "none"'                                                                 '$3 = "opt/VirtualBox/"$3"="$3'
+hardlink_fixup prototype '$2 == "none"'                                                                 '$3 = "opt/VirtualBox/"$3'
 
 # install the kernel modules to the right place.

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

@@ -60 +60 @@
     /usr/sbin/installf -c none $PKGINST /usr/bin/VirtualBox=$VBOXBASEDIR/VBox.sh s
     /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxQtconfig=$VBOXBASEDIR/VBox.sh s
-    /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VirtualBox f
-    /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VBoxQtconfig f
-    ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VirtualBox
-    ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VBoxQtconfig
 fi
 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxManage=$VBOXBASEDIR/VBox.sh s
 /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxSDL=$VBOXBASEDIR/VBox.sh s
-/usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VBoxManage f
-/usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VBoxSDL f
-/usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/vboxwebsrv f
-/usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/webtest f
-/usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VBoxZoneAccess f
-ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VBoxManage
-ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VBoxSDL
-ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/vboxwebsrv
-ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/webtest
-ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VBoxZoneAccess
-if test -f "$VBOXBASEDIR/amd64/VBoxBFE" || test -f "$VBOXBASEDIR/i386/VBoxBFE"; then
-    /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VBoxBFE f
-    ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VBoxBFE
-fi
 if test -f "$VBOXBASEDIR/amd64/VBoxHeadless" || test -f "$VBOXBASEDIR/i386/VBoxHeadless"; then
     if test -d $VBOXBASEDIR/amd64; then
@@ -92 +74 @@
     /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxHeadless=/$VBOXBASEDIR/VBox.sh s
     /usr/sbin/installf -c none $PKGINST /usr/bin/VBoxVRDP=$VBOXBASEDIR/VBox.sh s
-    /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VBoxHeadless f
-    /usr/sbin/installf -c none $PKGINST $VBOXBASEDIR/VBoxVRDP f
-    ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VBoxHeadless
-    ln -f $VBOXBASEDIR/VBoxISAExec $VBOXBASEDIR/VBoxVRDP
 fi