Changeset 101937 in vbox for trunk/src/VBox/Additions/x11/Installer/x11restore.pl

Timestamp:

Nov 7, 2023 12:15:59 PM (13 months ago)

Author:

vboxsync

Message:

Additions/solaris/{Installer,vboxms,vboxservice}: Add support for the
Solaris Guest Additions to be installed into an alternate root path
('pkgad -R'). This also enables the Solaris GAs to be installed in an
automated fashion when building Solaris images using the distribution
constructor (aka the distro_const(8) utility).

File:

• trunk/src/VBox/Additions/x11/Installer/x11restore.pl (modified) (3 diffs)

trunk/src/VBox/Additions/x11/Installer/x11restore.pl

@@ -42 +42 @@
 foreach $cfg (@cfg_files)
 {
+    if (($os_type =~ 'SunOS') && (defined $ENV{PKG_INSTALL_ROOT}))
+    {
+        $cfg = $ENV{PKG_INSTALL_ROOT}.$cfg;
+    }
     if (open(CFG, $cfg))
     {
@@ -54 +58 @@
                 {
                     close(BAK);
+                    print("Restoring $cfg.back to $cfg.\n");
                     rename $cfg.".bak", $cfg;
                 }
@@ -73 +78 @@
     }
 }
-
-$config_count != 0 or die "Could not find backed-up xorg.conf to restore it.";
-