backport TIOCGDEV to make bootlogd work

diff --git a/Makefile b/Makefile
index dc7d4d280c433969c6f19503f1524bf563fed645..fc780a40afc7257987bc600cd4bc2d87330d6beb 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 RELEASE=3.0
 
 KERNEL_VER=2.6.32
-PKGREL=93
+PKGREL=94
 # also include firmware of previous versrion into 
 # the fw package:  fwlist-2.6.32-PREV-pve
 KREL=19
@@ -152,6 +152,7 @@ ${KERNEL_SRC}/README: ${KERNEL_SRC}.org/README
        cd ${KERNEL_SRC}; patch -p1 <../fix-aspm-policy.patch
        cd ${KERNEL_SRC}; patch -p1 <../kbuild-generate-mudules-builtin.patch
        cd ${KERNEL_SRC}; patch -p1 <../xfs-trans-ail-fix.patch
+       cd ${KERNEL_SRC}; patch -p1 <../add-tiocgdev-ioctl.patch
        #cd ${KERNEL_SRC}; patch -p1 <../optimize-cfq-parameters.patch
        sed -i ${KERNEL_SRC}/Makefile -e 's/^EXTRAVERSION.*$$/EXTRAVERSION=${EXTRAVERSION}/'
        touch $@

diff --git a/add-tiocgdev-ioctl.patch b/add-tiocgdev-ioctl.patch
new file mode 100644 (file)
index 0000000..70ba551
--- /dev/null
+++ b/add-tiocgdev-ioctl.patch
@@ -0,0 +1,24 @@
+--- linux-2.6-2.6.32/include/asm-generic/ioctls.h.org  2013-03-22 11:29:33.000000000 +0100
++++ linux-2.6-2.6.32/include/asm-generic/ioctls.h      2013-03-22 11:29:38.000000000 +0100
+@@ -65,6 +65,7 @@
+ #define TIOCSRS485    0x542F
+ #define TIOCGPTN      _IOR('T', 0x30, unsigned int) /* Get Pty Number (of pty-mux device) */
+ #define TIOCSPTLCK    _IOW('T', 0x31, int)  /* Lock/unlock Pty */
++#define TIOCGDEV        _IOR('T',0x32, unsigned int) /* Get primary device node of /dev/console */
+ #define TCGETX                0x5432 /* SYS5 TCGETX compatibility */
+ #define TCSETX                0x5433
+ #define TCSETXF               0x5434
+--- linux-2.6-2.6.32/drivers/char/tty_io.c.org 2013-03-22 11:02:50.000000000 +0100
++++ linux-2.6-2.6.32/drivers/char/tty_io.c     2013-03-22 11:30:34.000000000 +0100
+@@ -2617,6 +2617,11 @@
+               return put_user(tty->ldisc->ops->num, (int __user *)p);
+       case TIOCSETD:
+               return tiocsetd(tty, p);
++      case TIOCGDEV:
++      {
++              unsigned int ret = new_encode_dev(tty_devnum(real_tty));
++              return put_user(ret, (unsigned int __user *)p);
++      }
+       /*
+        * Break handling
+        */

diff --git a/changelog.Debian b/changelog.Debian
index 171f7c16a78bf5c0c73d5fa10aef8652a72f437f..3709666065d54ed5aac671d89a36f7c53a77eef7 100644 (file)
--- a/changelog.Debian
+++ b/changelog.Debian
@@ -1,3 +1,9 @@
+pve-kernel-2.6.32 (2.6.32-94) unstable; urgency=low
+
+  * backport TIOCGDEV to make bootlogd work
+
+ -- Proxmox Support Team <support@proxmox.com>  Fri, 22 Mar 2013 11:55:33 +0100
+
 pve-kernel-2.6.32 (2.6.32-93) unstable; urgency=low
 
   * updates for debian wheezy