Changeset 2558
- Timestamp:
- 07/10/07 22:34:48 (1 year ago)
- Files:
-
- trunk/contrib/manifest.dat.pathsubst (modified) (3 diffs)
- trunk/distrib/Makefile.am (modified) (1 diff)
- trunk/distrib/misc/h2ext.desc (added)
- trunk/pathconfig.h.pathsubst (modified) (1 diff)
- trunk/scripts/Makefile-files (modified) (2 diffs)
- trunk/scripts/h2ext-worker (added)
- trunk/scripts/magic.mime (deleted)
- trunk/scripts/util-vserver-vars.pathsubst (modified) (1 diff)
- trunk/scripts/vserver-build.template (modified) (1 diff)
- trunk/src/Makefile-files (modified) (3 diffs)
- trunk/src/h2ext.c (added)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/contrib/manifest.dat.pathsubst
r2540 r2558 18 18 build @PKGLIBDIR@/vserver-build.functions.pkgmgmt 19 19 build @PKGLIBDIR@/vserver-setup.functions 20 build @PKGLIBDIR@/magic.mime21 20 base @PKGLIBDIR@/vserver.functions 22 21 base @PKGLIBDIR@/vserver.start … … 49 48 build @PKGLIBDIR@/defaults/debootstrap.mirror 50 49 @ENSC_HAVE_C99_COMPILER_TRUE@build @PKGLIBDIR@/defaults/vunify-exclude 50 build @PKGLIBDIR@/defaults/h2ext.desc 51 51 base @PKGLIBDIR@/capchroot 52 52 base @PKGLIBDIR@/chain-echo … … 58 58 base @PKGLIBDIR@/fakerunlevel 59 59 base @PKGLIBDIR@/filetime 60 build @PKGLIBDIR@/h2ext 61 build @PKGLIBDIR@/h2ext-worker 60 62 base @PKGLIBDIR@/lockfile 61 63 base @PKGLIBDIR@/keep-ctx-alive trunk/distrib/Makefile.am
r2553 r2558 29 29 misc/vunify-exclude \ 30 30 misc/environment \ 31 misc/context.start 31 misc/context.start \ 32 misc/h2ext.desc 32 33 33 34 nobase_distrib_SCRIPTS = redhat/initpost \ trunk/pathconfig.h.pathsubst
r2283 r2558 45 45 46 46 #define PROG_SECURE_MOUNT PKGLIBDIR "/secure-mount" 47 #define PROG_H2EXT_WORKER PKGLIBDIR "/h2ext-worker" 47 48 48 49 #define PATH_VSERVER_START PKGLIBDIR "/vserver.start" trunk/scripts/Makefile-files
r2470 r2558 39 39 40 40 scripts_pkglib_src_DTA = scripts/functions \ 41 scripts/magic.mime \42 41 scripts/vserver-build.apt-rpm \ 43 42 scripts/vserver-build.skeleton \ … … 76 75 scripts/vshelper \ 77 76 scripts/vsysvwrapper \ 78 scripts/vyum-worker 77 scripts/vyum-worker \ 78 scripts/h2ext-worker 79 79 80 80 scripts_legacy_src_SCRPTS = scripts/legacy/save_s_context \ trunk/scripts/util-vserver-vars.pathsubst
r2468 r2558 41 41 _FAKE_RUNLEVEL="$__PKGLIBDIR/fakerunlevel" 42 42 _FILETIME="$__PKGLIBDIR/filetime" 43 _H2EXT="$__PKGLIBDIR/h2ext" 43 44 _IFSPEC="$__LEGACYDIR/ifspec" 44 45 _INITSYNC_MINIT_START=: trunk/scripts/vserver-build.template
r2554 r2558 70 70 pushd "$SETUP_CONFDIR/vdir" &> /dev/null 71 71 for t in "${TEMPLATE[@]}"; do 72 mime=$($_FILE -Nbiz -m "$_LIB_MAGIC" "$t")73 compression=$(echo "$mime" | $_GREP '(' | $_SED 's!.*(\(.*\))$!\1!')72 findFile DESC "$__CONFDIR/.defaults/apps/h2ext/desc" "$__PKGLIBDEFAULTDIR/h2ext.desc" 73 pipe=$($_H2EXT -d "$DESC" -q "$t") 74 74 75 case "$compression" in 76 application/x-bzip2) DECOMPRESS="$_BZIP2 -d -c";; 77 application/x-gzip) DECOMPRESS="$_GZIP -d -c";; 78 "") DECOMPRESS=$_CAT;; 79 *) 80 echo "Unsupported compression method: $compression" 81 exit 1 82 ;; 83 esac 75 if echo "$pipe" | grep -q "unknown format"; then 76 echo "vserver-build.template: $t: Unknown format" >&2 77 exit 1 78 fi 84 79 85 case "$mime" in 86 application/x-tar*) EXTRACT="$_TAR -x";; 87 application/x-cpio*) EXTRACT="$_CPIO -i";; 88 application/x-dump*) EXTRACT="$_RESTORE -rf -";; 89 *) 90 echo "Unsupported packaging method: $mime" 91 exit 1 92 ;; 93 esac 94 95 $DECOMPRESS "$t" | $EXTRACT 80 eval `echo $_CAT "\$t" '|' $pipe` 96 81 done 97 82 trunk/src/Makefile-files
r2491 r2558 81 81 src/vdevmap \ 82 82 src/vsysctl \ 83 src/vclone 83 src/vclone \ 84 src/h2ext 84 85 85 86 if ENSC_CAN_BEECRYPT_WITH_DIETLIBC … … 119 120 src/chbind-compat \ 120 121 src/vsysctl \ 122 src/h2ext \ 121 123 $(src_pkglib_C99_X_PROGS) \ 122 124 $(src_pkglib_CXX_X_PROGS) … … 337 339 src_vclone_LDFLAGS = $(VSERVER_LDLFGS) 338 340 341 src_h2ext_SOURCES = src/h2ext.c 342 src_h2ext_LDADD = $(LIBINTERNAL) $(VSERVER_LDADDS) 343 src_h2ext_LDFLAGS = $(VSERVER_LDFLGS) 344 339 345 EXTRA_PROGRAMS += $(src_sbin_CXX_PROGS) $(src_pkglib_CXX_PROGS) 340 346
