Changeset 27355 in vbox for trunk/src/VBox/Installer/solaris

Timestamp:

Mar 15, 2010 12:23:08 PM (15 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

58794

Message:

Solaris/Installer: don't pollute config files with unplumbed vboxnet instances.

File:

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

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

@@ -479 +479 @@
     nmaskbackupfile=$nmaskfile.vbox
     if test -f "$nmaskfile"; then
-        sed -e '/VirtualBox_SectionStart_DoNotEdit/,/VirtualBox_SectionEnd_DoNotEdit/d' $nmaskfile > $nmaskbackupfile
+        sed -e '/#VirtualBox_SectionStart/,/#VirtualBox_SectionEnd/d' $nmaskfile > $nmaskbackupfile
         mv -f $nmaskbackupfile $nmaskfile
     fi
@@ -596 +596 @@
                 inst=0
                 networkn=56
-                while test $inst -ne $MOD_VBOXNET_INST; do
+                while test $inst -ne 1; do
                     echo "vboxnet$inst  static 192.168.$networkn.1" >> $nwambackupfile
                     inst=`expr $inst + 1`
@@ -612 +612 @@
                 nmaskfile=/etc/netmasks
                 nmaskbackupfile=$nmaskfile.vbox
+                networkn=56
                 if test -f $nmaskfile; then
-                    sed -e '/VirtualBox_SectionStart_DoNotEdit/,/VirtualBox_SectionEnd_DoNotEdit/d' $nmaskfile > $nmaskbackupfile
-                    echo "VirtualBox_SectionStart_DoNotEdit" >> $nmaskbackupfile
-                    echo "192.168.$networkn.0 255.255.255.0" >> $nmaskbackupfile
-                    echo "VirtualBox_SectionEnd_DoNotEdit" >> $nmaskbackupfile
+                    sed -e '/#VirtualBox_SectionStart,/#VirtualBox_SectionEnd/d' $nmaskfile > $nmaskbackupfile
+                    echo "#VirtualBox_SectionStart" >> $nmaskbackupfile
+                    inst=0
+                    networkn=56
+                    while test $inst -ne 1; do
+                        echo "192.168.$networkn.0 255.255.255.0" >> $nmaskbackupfile
+                        inst=`expr $inst + 1`
+                        networkn=`expr $networkn + 1`
+                    done
+                    echo "#VirtualBox_SectionEnd" >> $nmaskbackupfile
                     mv -f $nmaskbackupfile $nmaskfile
                 fi