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

Timestamp:

Oct 24, 2012 8:32:14 AM (13 years ago)

Author:

vboxsync

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

81598

Message:

Main/Metrics: devmapper support in Linux (#6345)

Location:

trunk/src/VBox/Installer/linux

Files:

• Makefile.kmk (modified) (1 diff)
• debian/postinst.in (modified) (1 diff)
• debian/rules (modified) (1 diff)
• install.sh (modified) (1 diff)
• rpm/VirtualBox.tmpl.spec (modified) (2 diffs)

trunk/src/VBox/Installer/linux/Makefile.kmk

@@ -150 +150 @@
                 VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \
                 VBoxNetAdpCtl \
+                VBoxVolInfo \
                 VBoxSVC \
                 VBoxXPCOM.so \

trunk/src/VBox/Installer/linux/debian/postinst.in

@@ -69 +69 @@
   if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetAdpCtl > /dev/null 2>&1; then
     chmod 4511 /usr/lib/virtualbox/VBoxNetAdpCtl
+  fi
+  if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxVolInfo > /dev/null 2>&1; then
+    chmod 4511 /usr/lib/virtualbox/VBoxVolInfo
   fi
 

trunk/src/VBox/Installer/linux/debian/rules

@@ -246 +246 @@
         mv $(archdir)/VBoxNetDHCP $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBoxNetAdpCtl $(prefix)/usr/lib/$(package)
+        mv $(archdir)/VBoxVolInfo $(prefix)/usr/lib/$(package)
         mv $(archdir)/VBoxXPCOMIPCD $(prefix)/usr/lib/$(package)
         mv $(archdir)/components $(prefix)/usr/lib/$(package)/components

trunk/src/VBox/Installer/linux/install.sh

@@ -370 +370 @@
     fi
 
-    # This binary needs to be suid root in any case, even if not hardened
+    # This binaries need to be suid root in any case, even if not hardened
     test -e $INSTALLATION_DIR/VBoxNetAdpCtl && chmod 4511 $INSTALLATION_DIR/VBoxNetAdpCtl
+    test -e $INSTALLATION_DIR/VBoxVolInfo && chmod 4511 $INSTALLATION_DIR/VBoxVolInfo
 
     # Install runlevel scripts

trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec

@@ -81 +81 @@
 mv VBoxNetDHCP $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv VBoxNetAdpCtl $RPM_BUILD_ROOT/usr/lib/virtualbox
+mv VBoxVolInfo $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv VBoxXPCOMIPCD $RPM_BUILD_ROOT/usr/lib/virtualbox
 mv components $RPM_BUILD_ROOT/usr/lib/virtualbox/components
@@ -117 +118 @@
     mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done
 fi
-for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl; do
+for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl VBoxVolInfo; do
   chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/$i; done
 if [ -d ExtensionPacks/VNC ]; then