Changeset 47884 in vbox for trunk/src/VBox
- Timestamp:
- Aug 20, 2013 10:07:59 AM (12 years ago)
- svn:sync-xref-src-repo-rev:
- 88185
- Location:
- trunk/src/VBox/Installer/linux
- Files:
-
- 7 edited
-
Makefile.kmk (modified) (1 diff)
-
debian/lintian-override.in (modified) (1 diff)
-
debian/postinst.in (modified) (1 diff)
-
install.sh (modified) (2 diffs)
-
installer-common.sh (modified) (1 diff)
-
rpm/VirtualBox.tmpl.spec (modified) (2 diffs)
-
uninstall.sh (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Installer/linux/Makefile.kmk
r45775 r47884 151 151 VBoxManage \ 152 152 VBoxNetDHCP $(if $(VBOX_WITH_HARDENING),VBoxNetDHCP.so,) \ 153 $(if $(VBOX_WITH_LWIP_NAT),VBoxNetLwipNAT $(if $(VBOX_WITH_HARDENING),VBoxNetLwipNAT.so,),) \ 153 154 VBoxNetAdpCtl \ 154 155 $(if $(VBOX_WITH_DEVMAPPER),VBoxVolInfo,) \ -
trunk/src/VBox/Installer/linux/debian/lintian-override.in
r45776 r47884 16 16 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxDragAndDropSvc.so 17 17 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetDHCP.so 18 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxNetLwipNAT.so 18 19 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxVRDP.so 19 20 %VERPKG%: shlib-with-non-pic-code usr/lib/virtualbox/VBoxAuth.so -
trunk/src/VBox/Installer/linux/debian/postinst.in
r44866 r47884 66 66 if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetDHCP > /dev/null 2>&1; then 67 67 chmod 4511 /usr/lib/virtualbox/VBoxNetDHCP 68 fi 69 if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetLwipNAT > /dev/null 2>&1; then 70 chmod 4511 /usr/lib/virtualbox/VBoxNetLwipNAT 68 71 fi 69 72 if ! dpkg-statoverride --list /usr/lib/virtualbox/VBoxNetAdpCtl > /dev/null 2>&1; then -
trunk/src/VBox/Installer/linux/install.sh
r46870 r47884 247 247 terminate_proc VBoxSVC 248 248 terminate_proc VBoxNetDHCP 249 terminate_proc VBoxNetLwipNAT 249 250 250 251 # Remove previous installation … … 356 357 # and finally make sure the directory is only writable by the user (paranoid). 357 358 if [ -n "$HARDENED" ]; then 358 test -e $INSTALLATION_DIR/VirtualBox && chmod 4511 $INSTALLATION_DIR/VirtualBox 359 test -e $INSTALLATION_DIR/VBoxSDL && chmod 4511 $INSTALLATION_DIR/VBoxSDL 360 test -e $INSTALLATION_DIR/VBoxHeadless && chmod 4511 $INSTALLATION_DIR/VBoxHeadless 361 test -e $INSTALLATION_DIR/VBoxNetDHCP && chmod 4511 $INSTALLATION_DIR/VBoxNetDHCP 359 test -e $INSTALLATION_DIR/VirtualBox && chmod 4511 $INSTALLATION_DIR/VirtualBox 360 test -e $INSTALLATION_DIR/VBoxSDL && chmod 4511 $INSTALLATION_DIR/VBoxSDL 361 test -e $INSTALLATION_DIR/VBoxHeadless && chmod 4511 $INSTALLATION_DIR/VBoxHeadless 362 test -e $INSTALLATION_DIR/VBoxNetDHCP && chmod 4511 $INSTALLATION_DIR/VBoxNetDHCP 363 test -e $INSTALLATION_DIR/VBoxNetLwipNAT && chmod 4511 $INSTALLATION_DIR/VBoxNetLwipNAT 362 364 363 365 ln -sf $INSTALLATION_DIR/VBoxVMM.so $INSTALLATION_DIR/components/VBoxVMM.so -
trunk/src/VBox/Installer/linux/installer-common.sh
r44594 r47884 165 165 chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxNetDHCP \ 166 166 > /dev/null 2>&1 167 chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxNetLwipNAT \ 168 > /dev/null 2>&1 167 169 chcon -t java_exec_t "$INSTALLATION_DIR"/VBoxExtPackHelperApp \ 168 170 > /dev/null 2>&1 -
trunk/src/VBox/Installer/linux/rpm/VirtualBox.tmpl.spec
r46874 r47884 80 80 mv *.rel $RPM_BUILD_ROOT/usr/lib/virtualbox || true 81 81 mv VBoxNetDHCP $RPM_BUILD_ROOT/usr/lib/virtualbox 82 mv VBoxNetLwipNAT $RPM_BUILD_ROOT/usr/lib/virtualbox 82 83 mv VBoxNetAdpCtl $RPM_BUILD_ROOT/usr/lib/virtualbox 83 84 if [ -f VBoxVolInfo ]; then … … 121 122 mv $i $RPM_BUILD_ROOT/usr/lib/virtualbox; done 122 123 fi 123 for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNet AdpCtl; do124 for i in VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetLwipNAT VBoxNetAdpCtl; do 124 125 chmod 4511 $RPM_BUILD_ROOT/usr/lib/virtualbox/$i; done 125 126 if [ -f $RPM_BUILD_ROOT/usr/lib/virtualbox/VBoxVolInfo ]; then -
trunk/src/VBox/Installer/linux/uninstall.sh
r44528 r47884 58 58 # Terminate VBoxNetDHCP if running 59 59 terminate_proc VBoxNetDHCP 60 # Terminate VBoxNetLwipNAT if running 61 terminate_proc VBoxNetLwipNAT 60 62 delrunlevel vboxballoonctrl-service > /dev/null 2>&1 61 63 remove_init_script vboxballoonctrl-service … … 99 101 /usr/bin/VBoxAutostart \ 100 102 /usr/bin/VBoxNetDHCP \ 103 /usr/bin/VBoxNetLwipNAT \ 101 104 /usr/bin/vboxwebsrv \ 102 105 /usr/bin/VBoxAddIF \
Note:
See TracChangeset
for help on using the changeset viewer.
