summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-07-30 00:01:05 +0000
committerjlam <jlam@pkgsrc.org>2007-07-30 00:01:05 +0000
commit692a80baeba9cf9932f47494119dd6df9ed38d40 (patch)
tree0a0b92938652807a7389c3d16d4123b8a40ace33
parent89b89988089575f7c11191f82b86f9feaf2cd4bc (diff)
downloadpkgsrc-692a80baeba9cf9932f47494119dd6df9ed38d40.tar.gz
Assume that the +ROOT_ACTIONS script is always executed from the
current working directory. This should fix problems installing the suse*_base and suse*_vmware packages as a privileged user. When this package is installed as a privileged user, the +ROOT_ACTIONS script is executed from ${WRKDIR}/.pkginstall before the package metadata directory exists.
-rw-r--r--emulators/suse100_base/INSTALL4
-rw-r--r--emulators/suse100_vmware/INSTALL4
-rw-r--r--emulators/suse91_base/INSTALL4
-rw-r--r--emulators/suse91_vmware/INSTALL4
4 files changed, 8 insertions, 8 deletions
diff --git a/emulators/suse100_base/INSTALL b/emulators/suse100_base/INSTALL
index 51371f21458..12831a79c54 100644
--- a/emulators/suse100_base/INSTALL
+++ b/emulators/suse100_base/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.5 2007/07/29 05:18:39 jlam Exp $
+# $NetBSD: INSTALL,v 1.6 2007/07/30 00:01:05 jlam Exp $
# Generate a +ROOT_ACTIONS script that runs certain actions that require
# superuser privileges.
@@ -41,7 +41,7 @@ PKG_METADATA_DIR="${2-${CURDIR}}"
EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
OPSYS_EMULDIR="@OPSYS_EMULDIR@"
-ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+ROOT_ACTIONS_COOKIE="./+ROOT_ACTIONS_done"
EUID=`${ID} -u`
exitcode=0
diff --git a/emulators/suse100_vmware/INSTALL b/emulators/suse100_vmware/INSTALL
index c1d5d28d67c..600d8c86d6f 100644
--- a/emulators/suse100_vmware/INSTALL
+++ b/emulators/suse100_vmware/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:00 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2007/07/30 00:01:05 jlam Exp $
# Generate a +ROOT_ACTIONS script that runs certain actions that require
# superuser privileges.
@@ -43,7 +43,7 @@ PKG_METADATA_DIR="${2-${CURDIR}}"
: ${PKGNAME=${PKG_METADATA_DIR##*/}}
: ${PKG_PREFIX=@PREFIX@}
-ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+ROOT_ACTIONS_COOKIE="./+ROOT_ACTIONS_done"
EUID=`${ID} -u`
exitcode=0
diff --git a/emulators/suse91_base/INSTALL b/emulators/suse91_base/INSTALL
index 6edf26b6c4f..160521a80d9 100644
--- a/emulators/suse91_base/INSTALL
+++ b/emulators/suse91_base/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.4 2007/07/29 05:19:04 jlam Exp $
+# $NetBSD: INSTALL,v 1.5 2007/07/30 00:01:05 jlam Exp $
# Generate a +ROOT_ACTIONS script that runs certain actions that require
# superuser privileges.
@@ -41,7 +41,7 @@ PKG_METADATA_DIR="${2-${CURDIR}}"
EMULDIR="${PKG_PREFIX}/@EMULSUBDIR@"
OPSYS_EMULDIR="@OPSYS_EMULDIR@"
-ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+ROOT_ACTIONS_COOKIE="./+ROOT_ACTIONS_done"
EUID=`${ID} -u`
exitcode=0
diff --git a/emulators/suse91_vmware/INSTALL b/emulators/suse91_vmware/INSTALL
index 2ecaa0a2007..d0b88278f95 100644
--- a/emulators/suse91_vmware/INSTALL
+++ b/emulators/suse91_vmware/INSTALL
@@ -1,4 +1,4 @@
-# $NetBSD: INSTALL,v 1.1 2007/07/29 05:19:22 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2007/07/30 00:01:06 jlam Exp $
# Generate a +ROOT_ACTIONS script that runs certain actions that require
# superuser privileges.
@@ -43,7 +43,7 @@ PKG_METADATA_DIR="${2-${CURDIR}}"
: ${PKGNAME=${PKG_METADATA_DIR##*/}}
: ${PKG_PREFIX=@PREFIX@}
-ROOT_ACTIONS_COOKIE="${PKG_METADATA_DIR}/+ROOT_ACTIONS_done"
+ROOT_ACTIONS_COOKIE="./+ROOT_ACTIONS_done"
EUID=`${ID} -u`
exitcode=0