Fixed Fremantle prerm bug, first free Diablo version.

diff --git a/diablo/easy-deb-chroot/control/prerm b/diablo/easy-deb-chroot/control/prerm
index 92b94c4..72d2de0 100644 (file)
--- a/diablo/easy-deb-chroot/control/prerm
+++ b/diablo/easy-deb-chroot/control/prerm
@@ -1,3 +1,5 @@
 #!/bin/sh
 
+/sbin/closechroot
+
 exit 0
\ No newline at end of file

diff --git a/diablo/easy-deb-chroot/src/sbin/debian~ b/diablo/easy-deb-chroot/src/sbin/debian~
deleted file mode 100644 (file)
index 3dac113..0000000
--- a/diablo/easy-deb-chroot/src/sbin/debian~
+++ /dev/null
@@ -1,72 +0,0 @@
-#!/bin/sh
-# Sets up (if necessary) for chroot into a Debian environment.
-# Expects root privileges, does not drop them. 
-# Look to /usr/bin/debbie for a friendly wrapper.
-
-# By Alan M Bruce (qole) with help from Benson Mitchell
-#
-# GPL licensed; keep code free!
-
-if [ "`whoami`" != "root" ] ; then
-  echo "please run me as root!"
-  exit 9
-fi
-
-#Pull in the config, if possible...
-if [ -f "/home/user/.chroot" ] ; then
-
-. /home/user/.chroot
-
-else
-  echo "No ~/.chroot file." >/dev/stderr
-fi
-
-#This comes from the config file... If not, fall back on '/debian'
-if [ "x$CHROOT" = "x" ] ; then
-  CHROOT=/debian
-  echo "No chroot dir specified; using $CHROOT" >/dev/stderr
-else
-  echo "Chroot dir specified: $CHROOT" >/dev/stderr
-fi
-
-#This comes from the config. If not, search for debian*.img.ext2
-if [ "x$IMGFILE" = "x" ] ; then
-  echo "No image file or partition specified." >/dev/stderr
-  IMGMMC="`ls -1 /media/mmc?/debian*.img* | head -1`"
-  if [ "x$IMGMMC" != x ] ; then
-    IMGFILE="$IMGMMC"
-  else
-    MSG1=`printf "ERROR!\n\nYou have no debian.img.ext2 file on your memory cards.\n\nPlease use the Debian Image Installer in Extras."`
-    if [ ! -f "/usr/bin/gxmessage" ] ; then
-      echo $MSG1 >/dev/stderr
-    else
-      gxmessage -center -alignbuttons center -buttons GTK_STOCK_OK:0 -geometry 680x250 -title "MISSING DISK IMAGE" "$MSG1"
-    fi
-    exit 9
-  fi
-else
-  echo "$IMGFILE specified in ~/.chroot" >/dev/stderr
-fi
-
-#
-#Make the temp dir bigger for OpenOffice etc.
-#
-#This comes from the config file... 
-#If not, fall back to a 6MB /tmp dir
-#
-
-[ "x$TMPSIZE" != x ] || TMPSIZE=6M
-mount -o remount,size=$TMPSIZE /tmp
-
-#Messy hack to make tap-and-hold work with GTK apps.
-export GTK_MODULES=libgtkstylus.so
-
-#Some OpenOffice environment variables
-export SAL_USE_VCLPLUGIN="gtk"
-export OOO_FORCE_DESKTOP="gnome"
-export SAL_NOOPENGL="true"
-export OOO_DISABLE_RECOVERY="true"
-export SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION="true"
-#export SAL_DISABLE_CUPS="true"
-
-qchroot $IMGFILE $CHROOT "$@"

diff --git a/fremantle/easy-deb-chroot/build_easydebchroot.py b/fremantle/easy-deb-chroot/build_easydebchroot.py
index ce5fd15..38b030e 100755 (executable)
--- a/fremantle/easy-deb-chroot/build_easydebchroot.py
+++ b/fremantle/easy-deb-chroot/build_easydebchroot.py
@@ -40,12 +40,12 @@ if __name__ == "__main__":
      # p.postinstall="postinst"
      # p.postremove="postrm"
      # p.preinstall="preinst"
-     qoleprerm = open("control/preinst", "r")
+     qoleprerm = open("control/prerm", "r")
      p.preremove=qoleprerm.read()
      # p.preremove=""
 
      version = "0.9.33"   #Version of your software, e.g. "1.2.0" or "0.8.2"
-     build = "1fremantle1"         #Build number
+     build = "1fremantle2"         #Build number
                          #Text with changelog information to be displayed in the package "Details" tab of the HAM
      changeloginformation = "0.9.30 First version for Fremantle. Stripped down, but works."