execute '--initdb' before importing pubkeys
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Wed, 23 Mar 2005 02:08:22 +0000 (02:08 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Wed, 23 Mar 2005 02:08:22 +0000 (02:08 +0000)
import pubkeys from /etc/vservers/.distributions/.common/pubkeys also

git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1965 94cd875c-1c1d-0410-91d2-eb244daf1a30

util-vserver/scripts/vserver-build.apt-rpm
util-vserver/scripts/vserver-build.rpm
util-vserver/scripts/vserver-build.yum

index e260a50..f44391c 100644 (file)
@@ -50,8 +50,12 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$SETUP_CONFDIR" "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 rpm.initDB           "$SETUP_CONFDIR"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" \
+    "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
+    "$__CONFDIR/.distributions/.common/pubkeys" \
+    "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
+
 $_VAPT_GET "$SETUP_CONFDIR" -- update
 apt.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
 $_VAPT_GET "$SETUP_CONFDIR" -- dist-upgrade -y
index 2cc7819..9113a90 100644 (file)
@@ -91,8 +91,11 @@ cd "$tmpdir"
 ######  do the real work
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$SETUP_CONFDIR" "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 rpm.initDB           "$SETUP_CONFDIR"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" \
+    "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
+    "$__CONFDIR/.distributions/.common/pubkeys" \
+    "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 
 opts=()
 for i; do
index 8722c80..a861bca 100644 (file)
@@ -50,8 +50,11 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$SETUP_CONFDIR" "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 rpm.initDB           "$SETUP_CONFDIR"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" \
+    "$__CONFDIR/.distributions/$DISTRIBUTION/pubkeys" \
+    "$__CONFDIR/.distributions/.common/pubkeys" \
+    "$__DISTRIBDIR/$DISTRIBUTION/pubkeys"
 yum.installBasePackages "$SETUP_CONFDIR" "$PKGINSTALLDIR"
 $_VYUM "$SETUP_CONFDIR" -- clean all
 test -z "$BUILD_INITPOST" || "$BUILD_INITPOST" "$SETUP_CONFDIR" "$UTIL_VSERVER_VARS"