Make schroot scripts work on wheezy

diff --git a/modules/porterbox/files/schroot-dsa/config b/modules/porterbox/files/schroot-dsa/config
index 4667031251bd2514817db1215252802b6485e044..86be1a93577bb37355dea3866a50cef2d7e73064 100644 (file)
--- a/modules/porterbox/files/schroot-dsa/config
+++ b/modules/porterbox/files/schroot-dsa/config
@@ -5,7 +5,14 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-[ -e "/etc/schroot/default/config" ] && . "/etc/schroot/default/config"
+if [ -e "$/etc/schroot/default/config" ]; then
+        . "$/etc/schroot/default/config"
+else
+        FSTAB="/etc/schroot/default/fstab"
+        COPYFILES="/etc/schroot/default/copyfiles"
+        NSSDATABASES="/etc/schroot/default/nssdatabases"
+fi
+
 
 # added by weasel:
 if [ "$CHROOT_SESSION_PURGE" = "true" ]; then

diff --git a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options
index 26947b79d4e91098283e6784d5d6792aae2da3b7..1753a7d948c6703020ac48bf5a7da42ade72dd01 100755 (executable)
--- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options
+++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-apt-options
@@ -12,10 +12,8 @@ set -e
 . "$SETUP_DATA_DIR/common-data"
 . "$SETUP_DATA_DIR/common-functions"
 
-if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+if [ -f "${CHROOT_SCRIPT_CONFIG:-}" ]; then
     . "$CHROOT_SCRIPT_CONFIG"
-elif [ "$STATUS" = "ok" ]; then
-    fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist"
 fi
 
 

diff --git a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
index 854296a8f202d7b98dd24fa59736de7948342fd5..01fecbcab19b268b0b4f2472f6111ddcbfa1b9f9 100755 (executable)
--- a/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
+++ b/modules/porterbox/files/schroot-setup.d/99porterbox-extra-sources
@@ -12,10 +12,8 @@ set -e
 . "$SETUP_DATA_DIR/common-data"
 . "$SETUP_DATA_DIR/common-functions"
 
-if [ -f "$CHROOT_SCRIPT_CONFIG" ]; then
+if [ -f "${CHROOT_SCRIPT_CONFIG:-}" ]; then
     . "$CHROOT_SCRIPT_CONFIG"
-elif [ "$STATUS" = "ok" ]; then
-    fatal "script-config file '$CHROOT_SCRIPT_CONFIG' does not exist"
 fi