anaconda-popt.patch

   1 --- anaconda-11.4.0.8/loader2/loader.c~ 2007-12-14 02:04:10.000000000 +0100
   2 +++ anaconda-11.4.0.8/loader2/loader.c  2007-12-14 02:04:20.783481654 +0100
   3 @@ -27,6 +27,7 @@
   4  #include <execinfo.h>
   5  #include <fcntl.h>
   6  #include <newt.h>
   7 +#include "lang.h"
   8  #include <popt.h>
   9  #include <signal.h>
  10  #include <stdio.h>
  11 @@ -54,7 +55,6 @@
  12  #include "loader.h"
  13  #include "loadermisc.h" /* JKFIXME: functions here should be split out */
  14  #include "log.h"
  15 -#include "lang.h"
  16  #include "fwloader.h"
  17  #include "kbd.h"
  18  #include "kickstart.h"
  19 --- anaconda-11.4.0.8/loader2/modules.c~        2007-12-11 00:09:05.000000000 +0100
  20 +++ anaconda-11.4.0.8/loader2/modules.c 2007-12-14 02:14:35.241251371 +0100
  21 @@ -21,6 +21,7 @@
  22  #include <fcntl.h>
  23  #include <kudzu/kudzu.h>
  24  #include <newt.h>
  25 +#include "lang.h"
  26  #include <popt.h>
  27  #include <stdlib.h>
  28  #include <stdio.h>
  29 --- anaconda-11.4.0.8/loader2/driverdisk.c~     2007-12-11 00:09:05.000000000 +0100
  30 +++ anaconda-11.4.0.8/loader2/driverdisk.c      2007-12-14 02:16:02.235272469 +0100
  31 @@ -17,6 +17,7 @@
  32  #include <fcntl.h>
  33  #include <kudzu/kudzu.h>
  34  #include <newt.h>
  35 +#include "lang.h"
  36  #include <popt.h>
  37  #include <stdlib.h>
  38  #include <stdio.h>
  39 @@ -28,7 +29,6 @@
  40  #include "loader.h"
  41  #include "log.h"
  42  #include "loadermisc.h"
  43 -#include "lang.h"
  44  #include "fwloader.h"
  45  #include "method.h"
  46  #include "modules.h"
  47 --- anaconda-11.4.0.8/loader2/kickstart.c~      2007-12-11 00:09:05.000000000 +0100
  48 +++ anaconda-11.4.0.8/loader2/kickstart.c       2007-12-14 02:26:34.191839534 +0100
  49 @@ -23,6 +23,7 @@
  50  #include <fcntl.h>
  51  #include <kudzu/kudzu.h>
  52  #include <newt.h>
  53 +#include "lang.h"
  54  #include <popt.h>
  55  #include <stdlib.h>
  56  #include <string.h>
  57 @@ -31,7 +32,6 @@
  58
  59  #include "loader.h"
  60  #include "loadermisc.h"
  61 -#include "lang.h"
  62  #include "log.h"
  63  #include "kickstart.h"
  64
  65 --- anaconda-11.4.0.8/loader2/hdinstall.c~      2007-12-11 00:09:05.000000000 +0100
  66 +++ anaconda-11.4.0.8/loader2/hdinstall.c       2007-12-14 02:27:38.187441262 +0100
  67 @@ -20,6 +20,7 @@
  68  #include <errno.h>
  69  #include <fcntl.h>
  70  #include <newt.h>
  71 +#include "lang.h"
  72  #include <popt.h>
  73  #include <stdlib.h>
  74  #include <string.h>
  75 @@ -33,7 +34,6 @@
  76  #include "loader.h"
  77  #include "loadermisc.h"
  78  #include "log.h"
  79 -#include "lang.h"
  80  #include "modules.h"
  81  #include "method.h"
  82  #include "mediacheck.h"
  83 --- anaconda-11.4.0.8/loader2/nfsinstall.c~     2007-12-11 00:09:05.000000000 +0100
  84 +++ anaconda-11.4.0.8/loader2/nfsinstall.c      2007-12-14 02:28:21.684451811 +0100
  85 @@ -18,13 +18,13 @@
  86
  87  #include <fcntl.h>
  88  #include <newt.h>
  89 +#include "lang.h"
  90  #include <popt.h>
  91  #include <stdlib.h>
  92  #include <string.h>
  93  #include <unistd.h>
  94
  95  #include "loader.h"
  96 -#include "lang.h"
  97  #include "loadermisc.h"
  98  #include "kickstart.h"
  99  #include "log.h"
 100 --- anaconda-11.4.0.8/loader2/urlinstall.c~     2007-12-11 00:09:05.000000000 +0100
 101 +++ anaconda-11.4.0.8/loader2/urlinstall.c      2007-12-14 02:29:03.181599806 +0100
 102 @@ -17,14 +17,15 @@
 103   */
 104
 105  #include <newt.h>
 106 -#include <popt.h>
 107  #include <stdlib.h>
 108  #include <string.h>
 109  #include <sys/mount.h>
 110  #include <unistd.h>
 111
 112  #include "../isys/nl.h"
 113
 114 +#include "lang.h"
 115 +#include <popt.h>
 116  #include "copy.h"
 117  #include "kickstart.h"
 118  #include "loader.h"
 119 --- anaconda-11.4.0.8/loader2/net.c~    2007-12-11 00:09:05.000000000 +0100
 120 +++ anaconda-11.4.0.8/loader2/net.c     2007-12-14 02:35:20.655656874 +0100
 121 @@ -27,6 +27,7 @@
 122  #include <sys/utsname.h>
 123  #include <arpa/inet.h>
 124  #include <errno.h>
 125 +#include "lang.h"
 126  #include <popt.h>
 127  #include <resolv.h>
 128  #include <net/if.h>
 129 @@ -44,7 +45,6 @@
 130  #include "../isys/nl.h"
 131  #include "../isys/str.h"
 132
 133 -#include "lang.h"
 134  #include "loader.h"
 135  #include "loadermisc.h"
 136  #include "log.h"