package/strongswan/patches/320-no-modprobe.patch

   1 Index: strongswan-2.8.2/programs/starter/klips.c
   2 ===================================================================
   3 --- strongswan-2.8.2.orig/programs/starter/klips.c      2007-06-04 13:23:04.544043096 +0200
   4 +++ strongswan-2.8.2/programs/starter/klips.c   2007-06-04 13:23:07.238633456 +0200
   5 @@ -44,7 +44,7 @@
   6             unsetenv("MODPATH");
   7             unsetenv("MODULECONF");
   8             system("depmod -a >/dev/null 2>&1");
   9 -           system("modprobe -qv ipsec");
  10 +           system("insmod -qv ipsec");
  11         }
  12         if (stat(PROC_IPSECVERSION, &stb) == 0)
  13         {
  14 @@ -62,11 +62,11 @@
  15      /* make sure that all available crypto algorithms are loaded */
  16      if (stat(PROC_MODULES, &stb) == 0)
  17      {
  18 -       system("modprobe -qv ipsec_aes");
  19 -       system("modprobe -qv ipsec_serpent");
  20 -       system("modprobe -qv ipsec_twofish");
  21 -       system("modprobe -qv ipsec_blowfish");
  22 -       system("modprobe -qv ipsec_sha2");
  23 +       system("insmod -qv ipsec_aes");
  24 +       system("insmod -qv ipsec_serpent");
  25 +       system("insmod -qv ipsec_twofish");
  26 +       system("insmod -qv ipsec_blowfish");
  27 +       system("insmod -qv ipsec_sha2");
  28      }
  29
  30      starter_klips_clear();
  31 Index: strongswan-2.8.2/programs/starter/netkey.c
  32 ===================================================================
  33 --- strongswan-2.8.2.orig/programs/starter/netkey.c     2007-06-04 13:23:04.551042032 +0200
  34 +++ strongswan-2.8.2/programs/starter/netkey.c  2007-06-04 13:23:07.238633456 +0200
  35 @@ -36,7 +36,7 @@
  36         /* af_key module makes the netkey proc interface visible */
  37         if (stat(PROC_MODULES, &stb) == 0)
  38         {
  39 -           system("modprobe -qv af_key");
  40 +           system("insmod -qv af_key");
  41         }
  42
  43         /* now test again */
  44 @@ -52,11 +52,11 @@
  45      /* make sure that all required IPsec modules are loaded */
  46      if (stat(PROC_MODULES, &stb) == 0)
  47      {
  48 -       system("modprobe -qv ah4");
  49 -       system("modprobe -qv esp4");
  50 -       system("modprobe -qv ipcomp");
  51 -       system("modprobe -qv xfrm4_tunnel");
  52 -       system("modprobe -qv xfrm_user");
  53 +       system("insmod -qv ah4");
  54 +       system("insmod -qv esp4");
  55 +       system("insmod -qv ipcomp");
  56 +       system("insmod -qv xfrm4_tunnel");
  57 +       system("insmod -qv xfrm_user");
  58      }
  59
  60      DBG(DBG_CONTROL,
  61 Index: strongswan-2.8.2/programs/_startklips/_startklips.in
  62 ===================================================================
  63 --- strongswan-2.8.2.orig/programs/_startklips/_startklips.in   2007-06-04 13:23:04.560040664 +0200
  64 +++ strongswan-2.8.2/programs/_startklips/_startklips.in        2007-06-04 13:23:07.238633456 +0200
  65 @@ -249,7 +249,7 @@
  66
  67  if test ! -f $ipsecversion && test ! -f $netkey
  68  then
  69 -       modprobe -v af_key
  70 +       insmod -v af_key
  71  fi
  72
  73  if test -f $netkey
  74 @@ -257,11 +257,11 @@
  75         klips=false
  76         if test -f $modules
  77         then
  78 -               modprobe -qv ah4
  79 -               modprobe -qv esp4
  80 -               modprobe -qv ipcomp
  81 -               modprobe -qv xfrm4_tunnel
  82 -               modprobe -qv xfrm_user
  83 +               insmod -qv ah4
  84 +               insmod -qv esp4
  85 +               insmod -qv ipcomp
  86 +               insmod -qv xfrm4_tunnel
  87 +               insmod -qv xfrm_user
  88         fi
  89  fi
  90
  91 @@ -272,7 +272,7 @@
  92                  setmodule
  93                  unset MODPATH MODULECONF        # no user overrides!
  94                  depmod -a >/dev/null 2>&1
  95 -                modprobe -v ipsec
  96 +                insmod -v ipsec
  97          fi
  98          if test ! -f $ipsecversion
  99          then
 100 @@ -288,7 +288,7 @@
 101         do
 102                 if test -f $moduleinstplace/alg/ipsec_$alg.o
 103                 then
 104 -                       modprobe ipsec_$alg
 105 +                       insmod ipsec_$alg
 106                 fi
 107         done
 108  fi