VirtualBox

Changeset 9190

Show
Ignore:
Timestamp:
05/28/08 10:44:35 (3 months ago)
Author:
vboxsync
Message:

synced debian/, use vboxdrv and vboxnet from the Installer directory

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/debian/VBox.sh

    r8171 r9190  
    9696  VirtualBox) 
    9797    exec "/usr/lib/virtualbox-ose/VirtualBox" "$@" 
    98   ;; 
     98    ;; 
    9999  VBoxManage) 
    100100    exec "/usr/lib/virtualbox-ose/VBoxManage" "$@" 
    101   ;; 
     101    ;; 
    102102  VBoxSDL) 
    103103    exec "/usr/lib/virtualbox-ose/VBoxSDL" "$@" 
    104   ;; 
     104    ;; 
    105105  VBoxVRDP) 
    106106    exec "/usr/lib/virtualbox-ose/VBoxVRDP" "$@" 
    107   ;; 
     107    ;; 
    108108  VBoxHeadless) 
    109109    exec "/usr/lib/virtualbox-ose/VBoxHeadless" "$@" 
    110   ;; 
     110    ;; 
    111111  *) 
    112112    echo "Unknown application - $APP" 
    113   ;; 
     113    ;; 
    114114esac 

  • trunk/debian/dirs

    r5772 r9190  
    22/etc/vbox 
    33/etc/init.d 
     4/usr/src 
    45/usr/lib/virtualbox-ose 

  • trunk/debian/postinst

    r8171 r9190  
    2828  rm /etc/init.d/virtualbox 
    2929  update-rc.d virtualbox remove >/dev/null 
     30fi 
     31if [ -f /etc/vbox/vbox.cfg ]; then 
     32  echo "Found old version of /etc/vbox/vbox.cfg, removing." 
     33  rm /etc/vbox/vbox.cfg 
    3034fi 
    3135 

  • trunk/debian/preinst.in

    r8171 r9190  
    3232fi 
    3333 
     34# check for old installation 
     35if [ -r /etc/vbox/vbox.cfg ]; then 
     36  . /etc/vbox/vbox.cfg 
     37  if [ "x$INSTALL_DIR" != "x" -a -d "$INSTALL_DIR" ]; then 
     38    db_fset virtualbox/old-installation-found seen false || true 
     39    db_input high virtualbox/old-installation-found || true 
     40    db_go || true 
     41    exit 1 
     42  fi 
     43  # we will remove that file in postinst 
     44fi 
     45 
    3446# check for old vboxdrv modules 
    3547if find /lib/modules -name "vboxdrv\.*" 2>/dev/null|grep -q vboxdrv; then 

  • trunk/debian/rules

    r8267 r9190  
    202202        dh_installmenu 
    203203        $(if $(NOMODS),,dh_installmodules) 
    204         sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g;' \ 
    205             debian/vboxdrv.init.in > debian/vboxdrv.init 
     204        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge ucs1.3,$(debrel)),yes,)|g; s|%PACKAGE%|virtualbox-ose|g;' \ 
     205            src/VBox/Installer/linux/vboxdrv.sh.in > debian/vboxdrv.init 
    206206        sed -e 's|%NOLSB%|$(if $(filter _Debian_sarge,$(debrel)),yes,)|g;' \ 
    207             debian/vboxnet.init.in > debian/vboxnet.init 
     207            src/VBox/Installer/linux/vboxnet.sh.in > debian/vboxnet.init 
    208208        dh_installinit --name=vboxdrv 
    209209        dh_installinit --name=vboxnet 

  • trunk/debian/templates

    r6332 r9190  
    5252 merge all snapshots and saved states before you proceed because VM states are version 
    5353 specific. 
     54 
     55Template: virtualbox-ose/old-installation-found 
     56Type: note 
     57Description: Old installation found 
     58 An old installation of VirtualBox was found. To install this package the old package 
     59 has to be removed first. Have a look at /etc/vbox/vbox.cfg determine the installation 
     60 directory of the previous installation. After uninstalling the old package remove the file 
     61 /etc/vbox/vbox.cfg. 

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

    r8761 r9190  
    207207 
    208208$(PATH_TARGET)/vboxdrv.sh: vboxdrv.sh.in 
    209         $(QUIET)$(SED_EXT) -e "s|%NOLSB%|yes|g" $< > $@ 
     209        $(QUIET)$(SED_EXT) -e "s|%NOLSB%|yes|g; s|%PACKAGE%|virtualbox|g" $< > $@ 
    210210 
    211211$(PATH_TARGET)/vboxnet.sh: vboxnet.sh.in 

  • trunk/src/VBox/Installer/linux/vboxdrv.sh.in

    r9108 r9190  
    4141    BUILDINTMP="$INSTALL_DIR/src/build_in_tmp" 
    4242else 
    43     VBOXMANAGE="/usr/lib/virtualbox/VBoxManage" 
    44     BUILDINTMP="/usr/share/virtualbox/src/build_in_tmp" 
     43    VBOXMANAGE="/usr/lib/%PACKAGE%/VBoxManage" 
     44    BUILDINTMP="/usr/share/%PACKAGE%/src/build_in_tmp" 
    4545fi 
    4646 
    …… 
    5555fi 
    5656 
    57 [ -r /etc/default/virtualbox ] && . /etc/default/virtualbox 
     57[ -r /etc/default/%PACKAGE% ] && . /etc/default/%PACKAGE% 
    5858 
    5959if [ -z "$NOLSB" ]; then 
    …… 
    197197} 
    198198 
    199 # enter the following variables in /etc/default/virtualbox: 
     199# enter the following variables in /etc/default/%PACKAGE%: 
    200200#   SHUTDOWN_USERS="foo bar"   
    201201#     check for running VMs of user foo and user bar 

© 2008 Sun Microsystems, Inc.
Contact – Privacy policy