diff options
| author | Roger Leigh <rleigh@debian.org> | 2012-05-08 23:31:24 +0100 |
|---|---|---|
| committer | Roger Leigh <rleigh@debian.org> | 2012-05-08 23:31:24 +0100 |
| commit | 96f2db6ffd235ce64556a777d6a828b0ed4d0d25 (patch) | |
| tree | c569df1d0c9e9470d7062773fc72cdd2208352a0 /etc | |
| parent | d04e32dd3cc39ea641fc2848957292fe94751925 (diff) | |
| download | schroot-96f2db6ffd235ce64556a777d6a828b0ed4d0d25.tar.gz | |
setup: Fix paths for userdata
They require prefixing with the SYSCONFDIR. Also ensure
that SCHROOT_SETUP_DIR is not user-settable.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/setup.d/common-config | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/etc/setup.d/common-config b/etc/setup.d/common-config index 93a87993..91494a58 100644 --- a/etc/setup.d/common-config +++ b/etc/setup.d/common-config @@ -19,7 +19,7 @@ # Common configuration for use in schroot setup scripts if [ -n "${SETUP_CONFIG}" ]; then - SETUP_CONFIG="${SCHROOT_SYSCONF_DIR}/${SETUP_CONFIG}" + SETUP_CONFIG="${SYSCONF_DIR}/${SETUP_CONFIG}" if [ -f "$SETUP_CONFIG" ]; then . "$SETUP_CONFIG" elif [ "$STATUS" = "ok" ]; then @@ -32,3 +32,15 @@ else fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist" fi fi + +if [ -n "${SETUP_FSTAB}" ]; then + SETUP_FSTAB="${SYSCONF_DIR}/${SETUP_FSTAB}" +fi + +if [ -n "${SETUP_COPYFILES}" ]; then + SETUP_COPYFILES="${SYSCONF_DIR}/${SETUP_COPYFILES}" +fi + +if [ -n "${SETUP_NSSDATABASES}" ]; then + SETUP_NSSDATABASES="${SYSCONF_DIR}/${SETUP_NSSDATABASES}" +fi
\ No newline at end of file |