From 5dbc33c61b60e13b96c979a864104c73cc66dc5a Mon Sep 17 00:00:00 2001 From: Enrico Scholz Date: Wed, 14 Apr 2004 23:26:41 +0000 Subject: [PATCH] added support for '%config(...)' (or whatever) annotations git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1455 94cd875c-1c1d-0410-91d2-eb244daf1a30 --- util-vserver/contrib/make-manifest | 5 ++++- util-vserver/contrib/manifest.dat.pathsubst | 26 ++++++++++++++------------ 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/util-vserver/contrib/make-manifest b/util-vserver/contrib/make-manifest index cd6a4f7..7e497c7 100755 --- a/util-vserver/contrib/make-manifest +++ b/util-vserver/contrib/make-manifest @@ -25,7 +25,10 @@ for i in $name-{core,devel,base,build,legacy,lib,sysv}.list; do echo '%defattr(-,root,root,-)' >$i done -cat $data | while read style file; do +sed -e "s!@CONFIG@!$MANIFEST_CONFIG!g; + s!@CONFIG_NOREPLACE@!$MANIFEST_CONFIG_NOREPLACE!g" \ + $data | \ +while read style file; do test "$file" || continue case "$style" in (\#*) continue;; diff --git a/util-vserver/contrib/manifest.dat.pathsubst b/util-vserver/contrib/manifest.dat.pathsubst index aa0d759..5e528ac 100644 --- a/util-vserver/contrib/manifest.dat.pathsubst +++ b/util-vserver/contrib/manifest.dat.pathsubst @@ -107,15 +107,17 @@ base @MANDIR@/*/vpstree.* base @MANDIR@/*/vserver-stat* base @MANDIR@/*/vserver.* base @MANDIR@/*/vtop* -sysv @INITRDDIR@/v_gated -sysv @INITRDDIR@/v_httpd -sysv @INITRDDIR@/v_named -sysv @INITRDDIR@/v_portmap -sysv @INITRDDIR@/v_sendmail -sysv @INITRDDIR@/v_smb -sysv @INITRDDIR@/v_sshd -sysv @INITRDDIR@/v_xinetd -sysv @INITRDDIR@/vprocunhide -sysv @INITRDDIR@/vservers-default -legacy @INITRDDIR@/rebootmgr -legacy @INITRDDIR@/vservers-legacy +sysv @CONFIG@ @INITRDDIR@/v_gated +sysv @CONFIG@ @INITRDDIR@/v_httpd +sysv @CONFIG@ @INITRDDIR@/v_named +sysv @CONFIG@ @INITRDDIR@/v_portmap +sysv @CONFIG@ @INITRDDIR@/v_sendmail +sysv @CONFIG@ @INITRDDIR@/v_smb +sysv @CONFIG@ @INITRDDIR@/v_sshd +sysv @CONFIG@ @INITRDDIR@/v_xinetd +sysv @CONFIG@ @INITRDDIR@/vprocunhide +sysv @CONFIG@ @INITRDDIR@/vservers-default +legacy @CONFIG@ @INITRDDIR@/rebootmgr +legacy @CONFIG@ @INITRDDIR@/vservers-legacy +legacy @CONFIG_NOREPLACE@ @SYSCONFDIR@/vservers.conf +build @CONFIG_NOREPLACE@ @CONFDIR@/.distributions/*/apt/sources.list -- 1.8.1.5