Changeset 2482

Show
Ignore:
Timestamp:
01/30/07 00:37:07 (2 years ago)
Author:
dhozac
Message:

Add Gentoo initscripts.
Force sysv initscripts for the RPMs.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/Makefile.am

    r2367 r2482  
    227227include $(top_srcdir)/lib_internal/Makefile-files 
    228228include $(top_srcdir)/vserver-start/Makefile-files 
     229include $(top_srcdir)/gentoo/Makefile-files 
    229230 
    230231include $(top_srcdir)/m4/gpgsig.am 
  • trunk/configure.ac

    r2453 r2482  
    337337 
    338338 
     339dnl Check what distro this is, use Gentoo initscripts if appropriate 
     340AC_MSG_CHECKING([for host initscripts]) 
     341AC_ARG_WITH(initscripts, [force host initscripts (valid values are: gentoo, sysv)], [ 
     342        case "$withval" in 
     343        gentoo) ensc_with_init=gentoo;; 
     344        sysv)   ensc_with_init=sysv;; 
     345        *)      AC_MSG_ERROR([invalid initscripts value, only gentoo and sysv are supported]);; 
     346        esac 
     347        ], [ 
     348        if test -e /etc/gentoo-release; then 
     349                ensc_with_init=gentoo 
     350        else 
     351                ensc_with_init=sysv 
     352        fi 
     353        ]) 
     354AC_MSG_RESULT([$ensc_with_init]) 
     355AM_CONDITIONAL(HAVE_GENTOO_INIT, test x"$ensc_with_init" = xgentoo) 
     356AM_CONDITIONAL(HAVE_SYSV_INIT, test x"$ensc_with_init" = xsysv) 
     357 
     358 
    339359dnl BIG HACK! Do some autodetection here! 
    340360AC_DEFINE(UTMP_GID, [22], [The utmp gid-number]) 
  • trunk/util-vserver.spec.in

    r2451 r2482  
    173173%configure --with-initrddir=%_initrddir --enable-release \ 
    174174           %{?_without_dietlibc:--disable-dietlibc} \ 
    175            %{?_with_legacy:--enable-apis=NOLEGACY} 
     175           %{?_with_legacy:--enable-apis=NOLEGACY} \ 
     176           --with-initscripts=sysv 
    176177 
    177178%__make %{?_smp_mflags} all