Readd tagxid so the BootManager can work on all kernels.

diff --git a/kernel-2.6-planetlab.spec b/kernel-2.6-planetlab.spec
index cb4898c..f1a02bc 100644 (file)
--- a/kernel-2.6-planetlab.spec
+++ b/kernel-2.6-planetlab.spec
@@ -148,6 +148,7 @@ Patch530: linux-2.6-530-built-by-support.patch
 Patch540: linux-2.6-540-oom-kill.patch
 Patch550: linux-2.6-550-raise-default-nfile-ulimit.patch
 Patch560: linux-2.6-560-mmconf.patch
+Patch570: linux-2.6-570-tagxid.patch
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
 
@@ -324,6 +325,7 @@ KERNEL_PREVIOUS=vanilla
 %ApplyPatch 540
 %ApplyPatch 550
 %ApplyPatch 560
+%ApplyPatch 570
 
 # NetNS conflict-resolving patch for VINI. Will work with patch vini_pl_patch-1 but may
 # break with later patches.

diff --git a/linux-2.6-570-tagxid.patch b/linux-2.6-570-tagxid.patch
new file mode 100644 (file)
index 0000000..f0c23d7
--- /dev/null
+++ b/linux-2.6-570-tagxid.patch
@@ -0,0 +1,55 @@
+diff -Nurp linux-2.6.22-560/fs/ext2/super.c linux-2.6.22-570/fs/ext2/super.c
+--- linux-2.6.22-560/fs/ext2/super.c   2007-12-04 14:51:22.000000000 -0500
++++ linux-2.6.22-570/fs/ext2/super.c   2007-12-05 16:19:17.000000000 -0500
+@@ -350,6 +350,7 @@ static match_table_t tokens = {
+       {Opt_noacl, "noacl"},
+       {Opt_xip, "xip"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_grpquota, "grpquota"},
+diff -Nurp linux-2.6.22-560/fs/ext3/super.c linux-2.6.22-570/fs/ext3/super.c
+--- linux-2.6.22-560/fs/ext3/super.c   2007-12-04 14:51:22.000000000 -0500
++++ linux-2.6.22-570/fs/ext3/super.c   2007-12-05 16:19:02.000000000 -0500
+@@ -725,6 +725,7 @@ static match_table_t tokens = {
+       {Opt_usrquota, "usrquota"},
+       {Opt_barrier, "barrier=%u"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_err, NULL},
+diff -Nurp linux-2.6.22-560/fs/ext4/super.c linux-2.6.22-570/fs/ext4/super.c
+--- linux-2.6.22-560/fs/ext4/super.c   2007-12-04 14:51:22.000000000 -0500
++++ linux-2.6.22-570/fs/ext4/super.c   2007-12-05 16:19:32.000000000 -0500
+@@ -777,6 +777,7 @@ static match_table_t tokens = {
+       {Opt_barrier, "barrier=%u"},
+       {Opt_extents, "extents"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_err, NULL},
+diff -Nurp linux-2.6.22-560/fs/jffs2/super.c linux-2.6.22-570/fs/jffs2/super.c
+--- linux-2.6.22-560/fs/jffs2/super.c  2007-12-04 14:51:22.000000000 -0500
++++ linux-2.6.22-570/fs/jffs2/super.c  2007-12-05 16:20:28.000000000 -0500
+@@ -82,6 +82,7 @@ enum {
+ 
+ static match_table_t tokens = {
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_err, NULL}
+ };
+diff -Nurp linux-2.6.22-560/fs/ocfs2/super.c linux-2.6.22-570/fs/ocfs2/super.c
+--- linux-2.6.22-560/fs/ocfs2/super.c  2007-12-04 14:51:23.000000000 -0500
++++ linux-2.6.22-570/fs/ocfs2/super.c  2007-12-05 16:21:04.000000000 -0500
+@@ -156,6 +156,7 @@ static match_table_t tokens = {
+       {Opt_data_writeback, "data=writeback"},
+       {Opt_atime_quantum, "atime_quantum=%u"},
+       {Opt_tag, "tag"},
++      {Opt_tag, "tagxid"},
+       {Opt_notag, "notag"},
+       {Opt_tagid, "tagid=%u"},
+       {Opt_err, NULL}