From d395a925b47d25ac80b35c2b97e7498cc607259e Mon Sep 17 00:00:00 2001
From: Silvan Calarco <silvan.calarco@mambasoft.it>
Date: Sun, 25 Jan 2015 16:26:14 +0100
Subject: [PATCH] diskimg: support for RELEASE

---
 Makefile.defs                 |  2 +-
 platforms/diskimg/post.inc.sh | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Makefile.defs b/Makefile.defs
index c78b446..b41db2a 100644
--- a/Makefile.defs
+++ b/Makefile.defs
@@ -209,7 +209,7 @@ python = python
 sopranobackend = soprano-backend-virtuoso
 dhcpclient = dhcp-client
 networkmanagergui = network-manager-applet
-phonon_backend = phonon-backend-gstreamer
+phonon_backend = phonon-backend-gstreamer010
 mono[Mono.Cecil] = mono-core
 mono[Mono.Cecil.Mdb] = mono-core
 mono[gdk-sharp]= gtk-sharp2
diff --git a/platforms/diskimg/post.inc.sh b/platforms/diskimg/post.inc.sh
index 82816e8..fa9f8ab 100644
--- a/platforms/diskimg/post.inc.sh
+++ b/platforms/diskimg/post.inc.sh
@@ -1,6 +1,8 @@
+[ "$RELEASE" -a "$RELEASE" != "devel" ] && RELEASE_ADD="-$RELEASE" || RELEASE_ADD=
 if [ "$MODE" = "rootfsinstall" ]; then
-   /usr/sbin/rootfsinstall -y $ROOTFSINSTALL_ADD $LOOPDEV \
-      $LOCALSTATEDIR/openmamba-rootfs-light-$LANGUAGE.$DEVICEARCH.tar.xz || \
+   DISKIMG_FILE="$LOCALSTATEDIR/openmamba-rootfs-light${RELEASE_ADD}-$LANGUAGE.$DEVICEARCH.tar.xz"
+   echo "Using image $DISKIMG_FILE..."
+   /usr/sbin/rootfsinstall -y $ROOTFSINSTALL_ADD $LOOPDEV $DISKIMG_FILE || \
        { retcode=$?
          echo "$makedist_me: fatal error, aborting installation" >&2
          echo "$makedist_me: exit code was: $retcode" >&2
@@ -8,9 +10,11 @@ if [ "$MODE" = "rootfsinstall" ]; then
          sleep 600
          { (exit 1); exit 1; }; }
 elif [ "$MODE" = "usbinstall" ]; then
+   DISKIMG_FILE="$LOCALSTATEDIR/openmamba${RELEASE_ADD}-livecd-$LANGUAGE.$ARCH.iso"
+   echo "Using image $DISKIMG_FILE..."
    # FIXME: current hosting system requirements:
    # grub-efi.i586 mactel-boot
-   /usr/sbin/usbinstall $LOOPDEV $LOCALSTATEDIR/openmamba-livecd-$LANGUAGE.$ARCH.iso -y || \
+   /usr/sbin/usbinstall $LOOPDEV $DISKIMG_FILE -y || \
        { retcode=$?
          echo "$makedist_me: fatal error, aborting installation" >&2
          echo "$makedist_me: exit code was: $retcode" >&2