[sbuild::chroot_file] Move CHROOT_FILE_UNPACK_DIR from session UNPACK_DIR

6 files changed, 19 insertions, 18 deletions

diff --git a/bin/schroot/Makefile.am b/bin/schroot/Makefile.am
index 8a825b97..a4d0a2a0 100644
--- a/bin/schroot/Makefile.am
+++ b/bin/schroot/Makefile.am
@@ -54,4 +54,4 @@ install-data-hook:
 	$(mkinstalldirs) $(DESTDIR)$(SCHROOT_CONF_CHROOT_D)
 	$(mkinstalldirs) $(DESTDIR)$(SCHROOT_MOUNT_DIR)
 	$(mkinstalldirs) $(DESTDIR)$(SCHROOT_SESSION_DIR)
-	$(mkinstalldirs) $(DESTDIR)$(SCHROOT_UNPACK_DIR)
+	$(mkinstalldirs) $(DESTDIR)$(SCHROOT_FILE_UNPACK_DIR)
diff --git a/configure.ac b/configure.ac
index 5c649e88..a3b7cc61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -411,10 +411,10 @@ AC_SUBST([SCHROOT_SESSION_DIR])
 AH_TEMPLATE(SCHROOT_SESSION_DIR, [schroot session directory])
 AC_DEFINE_UNQUOTED(SCHROOT_SESSION_DIR, ["$SCHROOT_SESSION_DIR"])
 
-SCHROOT_UNPACK_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/unpack"
-AC_SUBST([SCHROOT_UNPACK_DIR])
-AH_TEMPLATE(SCHROOT_UNPACK_DIR, [schroot unpack directory])
-AC_DEFINE_UNQUOTED(SCHROOT_UNPACK_DIR, ["$SCHROOT_UNPACK_DIR"])
+SCHROOT_FILE_UNPACK_DIR="${PACKAGE_LOCALSTATE_DIR}/lib/${PACKAGE}/unpack"
+AC_SUBST([SCHROOT_FILE_UNPACK_DIR])
+AH_TEMPLATE(SCHROOT_FILE_UNPACK_DIR, [schroot file unpack directory])
+AC_DEFINE_UNQUOTED(SCHROOT_FILE_UNPACK_DIR, ["$SCHROOT_FILE_UNPACK_DIR"])
 
 dnl Set PACKAGE_SYSCONF_DIR in config.h.
 AH_TEMPLATE(PACKAGE_SYSCONF_DIR, [Package system configuration directory])
diff --git a/etc/setup.d/00check b/etc/setup.d/00check
index e71239ac..678b2127 100755
--- a/etc/setup.d/00check
+++ b/etc/setup.d/00check
@@ -40,7 +40,6 @@ if [ $1 = "setup-start" ] || [ $1 = "setup-recover" ]; then
 	echo "AUTH_SHELL=$AUTH_SHELL"
 	echo "AUTH_VERBOSITY=$AUTH_VERBOSITY"
 	echo "MOUNT_DIR=$MOUNT_DIR"
-	echo "UNPACK_DIR=$UNPACK_DIR"
 	echo "LIBEXEC_DIR=$LIBEXEC_DIR"
 	echo "PID=$PID"
 	echo "SESSION_ID=$SESSION_ID"
@@ -56,6 +55,7 @@ if [ $1 = "setup-start" ] || [ $1 = "setup-recover" ]; then
 	elif [ "$CHROOT_TYPE" = "file" ]; then
 	    echo "CHROOT_FILE=$CHROOT_FILE"
 	    echo "CHROOT_FILE_REPACK=$CHROOT_FILE_REPACK"
+	    echo "CHROOT_FILE_UNPACK_DIR=$CHROOT_FILE_UNPACK_DIR"
 	elif [ "$CHROOT_TYPE" = "block-device" ] || [ "$CHROOT_TYPE" = "lvm-snapshot" ]; then
 	    echo "CHROOT_DEVICE=$CHROOT_DEVICE"
 	    echo "CHROOT_MOUNT_OPTIONS=$CHROOT_MOUNT_OPTIONS"
diff --git a/sbuild/sbuild-chroot-file.cc b/sbuild/sbuild-chroot-file.cc
index 6863c8d9..3e4faebf 100644
--- a/sbuild/sbuild-chroot-file.cc
+++ b/sbuild/sbuild-chroot-file.cc
@@ -104,6 +104,7 @@ chroot_file::setup_env (environment& env)
 
   env.add("CHROOT_FILE", get_file());
   env.add("CHROOT_FILE_REPACK", this->repack);
+  env.add("CHROOT_FILE_UNPACK_DIR", SCHROOT_FILE_UNPACK_DIR);
 }
 
 void
diff --git a/sbuild/sbuild-session.cc b/sbuild/sbuild-session.cc
index 83ff22a2..d982e263 100644
--- a/sbuild/sbuild-session.cc
+++ b/sbuild/sbuild-session.cc
@@ -1061,7 +1061,6 @@ session::setup_chroot (sbuild::chroot::ptr&       session_chroot,
   }
 
   env.add("MOUNT_DIR", SCHROOT_MOUNT_DIR);
-  env.add("UNPACK_DIR", SCHROOT_UNPACK_DIR);
   env.add("LIBEXEC_DIR", SCHROOT_LIBEXEC_DIR);
   env.add("PID", getpid());
   env.add("SESSION_ID", this->session_id);
diff --git a/test/sbuild-chroot-file.cc b/test/sbuild-chroot-file.cc
index d153f925..815dc2a5 100644
--- a/test/sbuild-chroot-file.cc
+++ b/test/sbuild-chroot-file.cc
@@ -81,17 +81,18 @@ public:
   void test_setup_env()
   {
     sbuild::environment expected;
-    expected.add("CHROOT_TYPE",           "file");
-    expected.add("CHROOT_NAME",           "test-name");
-    expected.add("CHROOT_DESCRIPTION",    "test-description");
-    expected.add("CHROOT_FILE",           "/srv/chroot/example.tar.bz2");
-    expected.add("CHROOT_FILE_REPACK",    "false");
-    expected.add("CHROOT_MOUNT_LOCATION", "/mnt/mount-location");
-    expected.add("CHROOT_PATH",           "/mnt/mount-location");
-    expected.add("CHROOT_SCRIPT_CONFIG",  sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
-    expected.add("CHROOT_SESSION_CLONE",  "true");
-    expected.add("CHROOT_SESSION_CREATE", "true");
-    expected.add("CHROOT_SESSION_PURGE",  "false");
+    expected.add("CHROOT_TYPE",            "file");
+    expected.add("CHROOT_NAME",            "test-name");
+    expected.add("CHROOT_DESCRIPTION",     "test-description");
+    expected.add("CHROOT_FILE",            "/srv/chroot/example.tar.bz2");
+    expected.add("CHROOT_FILE_REPACK",     "false");
+    expected.add("CHROOT_FILE_UNPACK_DIR", SCHROOT_FILE_UNPACK_DIR); 
+    expected.add("CHROOT_MOUNT_LOCATION",  "/mnt/mount-location");
+    expected.add("CHROOT_PATH",            "/mnt/mount-location");
+    expected.add("CHROOT_SCRIPT_CONFIG",   sbuild::normalname(std::string(PACKAGE_SYSCONF_DIR) + "/script-defaults"));
+    expected.add("CHROOT_SESSION_CLONE",   "true");
+    expected.add("CHROOT_SESSION_CREATE",  "true");
+    expected.add("CHROOT_SESSION_PURGE",   "false");
 
     test_chroot_base<chroot_file>::test_setup_env(expected);
   }