Changeset 1337 for trunk


Ignore:
Timestamp:
Oct 13, 2009, 1:11:51 AM (13 years ago)
Author:
geofft
Message:
execsys: Stop automatically generating the binfmt_misc configuration.

While we're there, kill an autoconf macro that was never used.

Location:
trunk/server/common/oursrc/execsys
Files:
4 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/server/common/oursrc/execsys/Makefile.in

    r849 r1337  
    1010trusteddir = /usr/libexec/scripts-trusted
    1111
    12 all-local: static-cat execsys-binfmt
     12all-local: static-cat
    1313
    14 static-cat.c execsys-binfmt: static-cat.c.pre execsys-binfmt.pre
    15         @UPD_VARS@ syscat_path=$(SYSCATPATH)/static-cat perl upd-execsys
     14static-cat.c: static-cat.c.pre execsys-binfmt.pre
     15        syscat_path=$(SYSCATPATH)/static-cat perl upd-execsys
    1616
    1717install: all-local
  • trunk/server/common/oursrc/execsys/configure.in

    r165 r1337  
    33AC_PROG_CC
    44
    5 AC_ARG_WITH(afsagent,
    6 [  --with-afsagent[=UID]        afsagent will have user id UID],[
    7   if test "$withval" != "no" -a "$withval" != "yes"; then
    8     CFLAGS="-DAFSAGENT_UID=$withval $CCFLAGS"
    9   fi
    10 ])
    11 
    12 AC_DEFUN(SUPPORT,[AC_ARG_WITH($1,
    13 [  --with-$1[=PATH]$2       associate .$1 with PATH],[
    14   if test "$withval" != "no" -a "$withval" != "yes"; then
    15     UPD_VARS="$1_path=$withval $UPD_VARS"
    16   fi
    17 ])])
    18 
    19 # the second argument should contain no spaces ("[]") if the corresponding
    20 # extension is three characters long (eg, "php"), and it should contain
    21 # one space ("[ ]") if the corresponding extension is two characters long
    22 # (eg, "pl")
    23 
    24 SUPPORT([pl], [ ])
    25 SUPPORT([php], [])
    26 SUPPORT([py], [ ])
    27 SUPPORT([exe], [])
    28 
    29 AC_SUBST(UPD_VARS)
    305AC_OUTPUT(Makefile)
  • trunk/server/common/oursrc/execsys/execsys-binfmt

    r1336 r1337  
    2727{
    2828    mount -t binfmt_misc none /proc/sys/fs/binfmt_misc
    29 # START-AUTOGENERATED: DO NOT EDIT THIS SECTION, INCLUDING THIS LINE!
    30 # This section is populated by the script upd-execsys
    31 # END-AUTOGENERATED: DO NOT EDIT THIS SECTION, INCLUDING THIS LINE!
     29    cat > /proc/sys/fs/binfmt_misc/register <<REGISTER
     30:pl:E::pl::/usr/bin/perl:
     31:php:E::php::/usr/bin/php-cgi:
     32:py:E::py::/usr/bin/python:
     33:exe:E::exe::/usr/bin/mono:
     34REGISTER
    3235}
    3336
  • trunk/server/common/oursrc/execsys/mrproper

    r764 r1337  
    33rm -f static-cat
    44rm -f configure config.* Makefile
    5 rm -f execsys-binfmt static-cat.c execsys.conf
     5rm -f static-cat.c execsys.conf
    66rm -rf auto*.cache
  • trunk/server/common/oursrc/execsys/upd-execsys

    r944 r1337  
    8585my $regexp = '(.*[\/\#]+\sSTART-AUTOGENERATED:[^!]*!).*\s([\/\#]+\sEND-AUTOGENERATED.*)';
    8686
    87 # Read existing binfmt file
    88 
    89 open(BINFMT, "./execsys-binfmt.pre");
    90 my $file = <BINFMT>;
    91 my ($fstart, $fend) = ($file =~ /$regexp/s);
    92 close(BINFMT);
    93 
    94 # Write new binfmt file
    95 
    96 open(BINFMT, ">./execsys-binfmt");
    97 print BINFMT $fstart, "\n";
    98 
    99 foreach my $ext (@dynamic) {
    100   my $path = $ENV{"${ext}_path"};
    101   print BINFMT "echo \":${ext}:E::${ext}::${path}:\" > /proc/sys/fs/binfmt_misc/register\n" if($path);
    102 }
    103 
    104 #foreach my $ext (@static) {
    105 #       print BINFMT "echo \":${ext}:E::${ext}::$ENV{syscat_path}:\" > /proc/sys/fs/binfmt_misc/register\n";
    106 #}
    107 print BINFMT $fend;
    108 close(BINFMT);
    109 
    11087open(CONF, ">./execsys.conf");
    11188
Note: See TracChangeset for help on using the changeset viewer.