add patch for 99_ftbfs_define_enoioctlcmd.patch

diff --git a/debian/src/initscripts/etc/init.d/umountnfs.sh b/debian/src/initscripts/etc/init.d/umountnfs.sh
index 4838466..f835d69 100644 (file)
--- a/debian/src/initscripts/etc/init.d/umountnfs.sh
+++ b/debian/src/initscripts/etc/init.d/umountnfs.sh
@@ -86,6 +86,10 @@ do_stop () {
                ES=$?
                [ "$VERBOSE" = no ] || log_action_end_msg $ES
        fi
+
+       # emit unmounted-remote-filesystems hook point so any upstart jobs
+       # that support remote filesystems can be stopped
+       initctl --quiet emit unmounted-remote-filesystems
 }
 
 case "$1" in

diff --git a/packaging/99_ftbfs_define_enoioctlcmd.patch b/packaging/99_ftbfs_define_enoioctlcmd.patch
new file mode 100644 (file)
index 0000000..af5eed3
--- /dev/null
+++ b/packaging/99_ftbfs_define_enoioctlcmd.patch
@@ -0,0 +1,18 @@
+Description: If ENOIOCTLCMD is not defined, then do so - fixes FTBFS.
+Origin: Cherry picked from upstream 2.88 release
+Reviewed-by: Dave Walker (Daviey) <DaveWalker@ubuntu.com>
+Last-Update: 2011-02-03
+
+--- a/src/bootlogd.c
++++ b/src/bootlogd.c
+@@ -254,6 +263,9 @@
+       }
+ 
+ #ifdef TIOCGDEV
++# ifndef  ENOIOCTLCMD
++#  define ENOIOCTLCMD 515
++# endif
+       if (ioctl(0, TIOCGDEV, &kdev) == 0) {
+               int r = findtty(res, "/dev", rlen, (dev_t)kdev);
+               if (0 != r)
+

diff --git a/packaging/sysvinit.spec b/packaging/sysvinit.spec
index d9cecd8..9a7a58a 100755 (executable)
--- a/packaging/sysvinit.spec
+++ b/packaging/sysvinit.spec
@@ -34,6 +34,7 @@ Patch16: add_initscripts.patch
 Patch18: 64_init_add_cmd_for_reboot.dpatch
 Patch19: 0001-Fixing-syntax-error-in-start-stop-daemon.c.patch
 Patch20: systemd_param.patch
+Patch21: 99_ftbfs_define_enoioctlcmd.patch
 
 %description
 The sysvinit package contains a group of processes that control
@@ -88,6 +89,7 @@ Requires: /lib/lsb/init-functions
 %patch18 -p1
 %patch19 -p1
 %patch20 -p1
+%patch21 -p1
 
 %build
 cp %{SOURCE1001} .