From 0de15ce8342d61439429115a720d152deb900e388facae84888ec8a1edad9e65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= <ismail@i10z.com>
Date: Thu, 14 Jan 2016 16:37:33 +0000
Subject: [PATCH] Accepting request 353709 from
 home:bmwiedemann:branches:Virtualization

- vboxadd script no more fails on remote_fs failure (bnc#908383)

change needs some testing

OBS-URL: https://build.opensuse.org/request/show/353709
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virtualbox?expand=0&rev=241
---
 vbox-vboxadd-init-script.diff | 26 +++++++++++---------------
 virtualbox.changes            |  5 +++++
 virtualbox.spec               |  2 +-
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/vbox-vboxadd-init-script.diff b/vbox-vboxadd-init-script.diff
index 5b7b960..57d3e7c 100644
--- a/vbox-vboxadd-init-script.diff
+++ b/vbox-vboxadd-init-script.diff
@@ -1,16 +1,12 @@
-Index: src/VBox/Additions/linux/installer/vboxadd.sh
-===================================================================
---- src/VBox/Additions/linux/installer/vboxadd.sh.orig
-+++ src/VBox/Additions/linux/installer/vboxadd.sh
-@@ -21,11 +21,12 @@
- #
- ### BEGIN INIT INFO
+--- src/VBox/Additions/linux/installer/vboxadd.sh.orig	2015-12-18 17:17:03.000000000 +0100
++++ src/VBox/Additions/linux/installer/vboxadd.sh	2016-01-14 15:45:13.793994484 +0100
+@@ -23,9 +23,12 @@
  # Provides:       vboxadd
--# Required-Start:
--# Required-Stop:
+ # Required-Start:
+ # Required-Stop:
 -# Default-Start:  2 3 4 5
-+# Required-Start: $remote_fs
-+# Required-Stop:  $remote_fs
++# Should-Start:   $remote_fs
++# Should-Stop:    $remote_fs
 +# Default-Start:  2 3 5
  # Default-Stop:   0 1 6
  # Description:    VirtualBox Linux Additions kernel modules
@@ -18,7 +14,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
  ### END INIT INFO
  
  PATH=$PATH:/bin:/sbin:/usr/sbin
-@@ -224,12 +225,6 @@ do_vboxguest_non_udev()
+@@ -224,12 +227,6 @@
              fail "Cannot create device $dev with major $maj and minor $min"
          }
      fi
@@ -31,7 +27,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
  
      if [ ! -c $userdev ]; then
          maj=10
-@@ -240,12 +235,6 @@ do_vboxguest_non_udev()
+@@ -240,12 +237,6 @@
                  rmmod vboxguest 2>/dev/null
                  fail "Cannot create device $userdev with major $maj and minor $min"
              }
@@ -44,7 +40,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
          fi
      fi
  }
-@@ -260,6 +249,13 @@ start()
+@@ -260,6 +251,13 @@
      fi
      test -n "$INSTALL_DIR" -a -n "$INSTALL_VER" ||
        fail "Configuration file $config not complete"
@@ -58,7 +54,7 @@ Index: src/VBox/Additions/linux/installer/vboxadd.sh
      uname -r | grep -q -E '^2\.6|^3|^4' 2>/dev/null &&
          ps -A -o comm | grep -q '/*udevd$' 2>/dev/null ||
          no_udev=1
-@@ -470,33 +466,8 @@ extra_setup()
+@@ -470,33 +468,8 @@
  # setup_script
  setup()
  {
diff --git a/virtualbox.changes b/virtualbox.changes
index b9a046b..084c5de 100644
--- a/virtualbox.changes
+++ b/virtualbox.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 14 14:47:01 UTC 2016 - bwiedemann@suse.com
+
+- vboxadd script no more fails on remote_fs failure (bnc#908383)
+
 -------------------------------------------------------------------
 Sat Dec 26 19:58:13 UTC 2015 - Larry.Finger@lwfinger.net
 
diff --git a/virtualbox.spec b/virtualbox.spec
index 7a747f4..a387891 100644
--- a/virtualbox.spec
+++ b/virtualbox.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package virtualbox
 #
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed