Changeset 37787 in vbox for trunk/src/VBox/Installer

Timestamp:

Jul 5, 2011 3:14:08 PM (14 years ago)

Author:

vboxsync

Message:

Solaris/Installer: fix incorrect replacing of /etc/netmasks symlink.

File:

• trunk/src/VBox/Installer/solaris/vboxconfig.sh (modified) (3 diffs)

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

@@ -643 +643 @@
 
     # remove netmask configuration
-    nmaskfile=$PKG_INSTALL_ROOT/etc/netmasks
+    nmaskfile=$PKG_INSTALL_ROOT/etc/inet/netmasks
     nmaskbackupfile=$nmaskfile.vbox
     if test -f "$nmaskfile"; then
@@ -817 +817 @@
                     $BIN_IFCONFIG vboxnet0 192.168.56.1 netmask 255.255.255.0 up
 
+                    # /etc/netmasks is a symlink, older installers replaced this with
+                    # a copy of the actual file, repair that behaviour here.
+                    recreatelink=0
+                    if test -h $PKG_INSTALL_ROOT/etc/netmasks; then
+                        nmaskfile=$PKG_INSTALL_ROOT/etc/inet/netmasks
+                    else
+                        nmaskfile=$PKG_INSTALL_ROOT/etc/netmasks
+                        recreatelink=1
+                    fi
+
                     # add the netmask to stay persistent across host reboots
-                    nmaskfile=$PKG_INSTALL_ROOT/etc/netmasks
                     nmaskbackupfile=$nmaskfile.vbox
                     if test -f $nmaskfile; then
@@ -832 +841 @@
                         echo "#VirtualBox_SectionEnd" >> $nmaskbackupfile
                         mv -f $nmaskbackupfile $nmaskfile
+
+                        # Recreate /etc/netmasks as a link if necessary
+                        if test $recreatelink -eq 1; then
+                            cp -f $PKG_INSTALL_ROOT/etc/netmasks $PKG_INSTALL_ROOT/etc/inet/netmasks
+                            ln -sf ./inet/netmasks $PKG_INSTALL_ROOT/etc/netmasks
+                        fi
                     fi
                 else