fixed installation at non-standard places
authorEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 29 Jun 2004 16:22:59 +0000 (16:22 +0000)
committerEnrico Scholz <enrico.scholz@informatik.tu-chemnitz.de>
Tue, 29 Jun 2004 16:22:59 +0000 (16:22 +0000)
git-svn-id: http://svn.linux-vserver.org/svn/util-vserver/trunk@1607 94cd875c-1c1d-0410-91d2-eb244daf1a30

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

index e01ab6b..a377dfe 100644 (file)
@@ -50,8 +50,8 @@ setup_writeOption "$VSERVER_NAME"
 setup_writeInitialFstab
 
 test -z "$BUILD_INITPRE"  || "$BUILD_INITPRE" "$SETUP_CONFDIR"  "$UTIL_VSERVER_VARS"
-rpm.importGPGPubKeys "$VSERVER_NAME" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
-rpm.initDB           "$VSERVER_NAME"
+rpm.importGPGPubKeys "$SETUP_CONFDIR" "$CONFDIR/.distributions/$DISTRIBUTION/pubkeys" "$DISTRIBDIR/$DISTRIBUTION/pubkeys"
+rpm.initDB           "$SETUP_CONFDIR"
 $_VAPT_GET "$SETUP_CONFDIR" -- update
 apt.installBasePackages "$SETUP_CONFDIR" "$PKGDIR"
 $_VAPT_GET "$SETUP_CONFDIR" -- dist-upgrade -y