Index: ipk/source/swapemus_mgcamd_1_35/CONTROL/postinst
===================================================================
--- ipk/source/swapemus_mgcamd_1_35/CONTROL/postinst	(revision 6357)
+++ ipk/source/swapemus_mgcamd_1_35/CONTROL/postinst	(revision 6678)
@@ -2,16 +2,70 @@
 TMP=/tmp/.mgcamd
 PLUGINDIR=/var/swap/bin
-CONFIGDIR=/var/etc
-CONFIGDIR=/var/swap/keys
+CONFIGDIR=/var/swap/etc
+PLUGINDIR=/var/swap/keys
 
-echo "Make Symlinks......."
-ln -s /var/swap/bin/mgcamd_1.35 /var/bin/mgcamd_1.35
-ln -s /var/swap/keys/cccamd.list /var/keys/cccamd.list
-ln -s /var/swap/keys/ignore.list /var/keys/ignore.list
-ln -s /var/swap/keys/mg_cfg /var/keys/mg_cfg
-ln -s /var/swap/keys/newcamd.list /var/keys/newcamd.list
-ln -s /var/swap/keys/peer.cfg /var/keys/peer.cfg
-ln -s /var/swap/keys/priority.list /var/keys/priority.list
-ln -s /var/swap/keys/replace.list /var/keys/replace.list
+
+if [ ! -e /var/swap/keys/cccamd.list ]; then
+	echo "use ipk config file: cccamd.list"
+	echo "rename /var/swap/keys/cccamd.list.mgcamd > /var/swap/keys/cccamd.list"
+	mv /var/swap/keys/cccamd.list.mgcamd /var/swap/keys/cccamd.list
+else
+	echo "found user config file: cccamd.list"
+	echo "skip ipk config file: cccamd.list.mgcamd"
+fi
+
+if [ ! -e /var/swap/keys/ignore.list ]; then
+	echo "use ipk config file: ignore.list"
+	echo "rename /var/swap/keys/ignore.list.mgcamd > /var/swap/keys/ignore.list"
+	mv /var/swap/keys/ignore.list.mgcamd /var/swap/keys/ignore.list
+else
+	echo "found user config file: cccamd.list"
+	echo "skip ipk config file: cccamd.list.mgcamd"
+fi
+
+if [ ! -e /var/swap/keys/mg_cfg ]; then
+	echo "use ipk config file: mg_cfg"
+	echo "rename /var/swap/keys/mg_cfg.mgcamd > /var/swap/keys/mg_cfg"
+	mv /var/swap/keys/mg_cfg.mgcamd /var/swap/keys/mg_cfg
+else
+	echo "found user config file: mg_cfg"
+	echo "skip ipk config file: mg_cfg.mgcamd"
+fi
+
+if [ ! -e /var/swap/keys/newcamd.list ]; then
+	echo "use ipk config file: newcamd.list"
+	echo "rename /var/swap/keys/newcamd.list.mgcamd > /var/swap/keys/newcamd.list"
+	mv /var/swap/keys/newcamd.list.mgcamd /var/swap/keys/newcamd.list
+else
+	echo "found user config file: newcamd.list"
+	echo "skip ipk config file: newcamd.list.mgcamd"
+fi
+
+if [ ! -e /var/swap/keys/peer.cfg ]; then
+	echo "use ipk config file: peer.cfg"
+	echo "rename /var/swap/keys/peer.cfg.mgcamd > /var/swap/keys/peer.cfg"
+	mv /var/swap/keys/peer.cfg.mgcamd /var/swap/keys/peer.cfg
+else
+	echo "found user config file: peer.cfg"
+	echo "skip ipk config file: peer.cfg.mgcamd"
+fi
+
+if [ ! -e /var/swap/keys/priority.list ]; then
+	echo "use ipk config file: priority.list"
+	echo "rename /var/swap/keys/priority.list.mgcamd > /var/swap/keys/priority.list"
+	mv /var/swap/keys/priority.list.mgcamd /var/swap/keys/priority.list
+else
+	echo "found user config file: priority.list"
+	echo "skip ipk config file: priority.list.mgcamd"
+fi
+
+if [ ! -e /var/swap/keys/replace.list ]; then
+	echo "use ipk config file: replace.list"
+	echo "rename /var/swap/keys/replace.list.mgcamd > /var/swap/keys/replace.list"
+	mv /var/swap/keys/replace.list.mgcamd /var/swap/keys/replace.list
+else
+	echo "found user config file: replace.list"
+	echo "skip ipk config file: replace.list.mgcamd"
+fi
 
 
Index: ipk/source/swapemus_mgcamd_1_35/CONTROL/postrm
===================================================================
--- ipk/source/swapemus_mgcamd_1_35/CONTROL/postrm	(revision 6357)
+++ ipk/source/swapemus_mgcamd_1_35/CONTROL/postrm	(revision 6678)
@@ -2,22 +2,8 @@
 TMP=/tmp/.mgcamd
 
-echo "remove Symlinks"
-
-rm /var/bin/mgcamd_1.35
-rm /var/keys/cccamd.list
-rm /var/keys/ignore.list
-rm /var/keys/mg_cfg
-rm /var/keys/newcamd.list
-rm /var/keys/peer.cfg
-rm /var/keys/priority.list
-rm /var/keys/replace.list
+rm -r /var/swap/bin/mgcamd_1.35_swap
 
 echo "successfully removed"
 echo "syncing disk"
 sync
-if [ `df | grep /dev/mtdblock | grep var | sed 's/ \+/ /g' | cut -d ' ' -f4 | tail -n1 | wc -l` -eq 1 ]; then
-	SPACE=`df | grep /dev/mtdblock | grep var | sed 's/ \+/ /g' | cut -d ' ' -f4 | tail -n1`
-	FREE=`expr $SPACE - 100`
-	echo new freespace size $FREE kb
-fi
 exit 0
Index: ipk/source/swapemus_mgcamd_1_35/CONTROL/preinst
===================================================================
--- ipk/source/swapemus_mgcamd_1_35/CONTROL/preinst	(revision 6357)
+++ ipk/source/swapemus_mgcamd_1_35/CONTROL/preinst	(revision 6678)
@@ -26,19 +26,5 @@
 fi
 echo "swapstick found...."
-
-echo "installing mgcamd to swapstick..."
-
-echo "checking OS"
-if  [ `cat /etc/motd | grep AAF | grep M | grep rev | wc -l` -eq 0 ]; then                      
-	echo ---------------------------
-	echo DONT USE this IPK Package!!
-	echo ---
-	echo Only for AAF Image!!
-	echo ---------------------------
-	exit 1
-fi
- 
-echo "installing mgcamd ..."
-
+echo "installing Mgcamd 1.35 to swapstick..."
 echo "checking OS"
 if  [ `cat /etc/motd | grep AAF | grep M | grep rev | wc -l` -eq 0 ]; then                      
@@ -51,3 +37,5 @@
 fi
 
+sync
+
 exit 0
Index: ipk/source/swapemus_mgcamd_1_35/CONTROL/prerm
===================================================================
--- ipk/source/swapemus_mgcamd_1_35/CONTROL/prerm	(revision 6357)
+++ ipk/source/swapemus_mgcamd_1_35/CONTROL/prerm	(revision 6678)
@@ -1,7 +1,42 @@
 #!/bin/sh
-#
 TMP=/tmp/.mgcamd
 echo "syncing disk"
+
+if [ ! -e /var/swap/keys/cccamd.list.mgcamd ]; then
+	echo "remove ipk cccamd.list"
+	rm /var/swap/keys/cccamd.list
+fi
+
+if [ ! -e /var/swap/keys/ignore.list.mgcamd ]; then
+	echo "remove ipk ignore.list"
+	rm /var/swap/keys/ignore.list
+fi
+
+if [ ! -e /var/swap/keys/mg_cfg.mgcamd ]; then
+	echo "remove ipk mg_cfg"
+	rm /var/swap/keys/mg_cfg
+fi
+
+if [ ! -e /var/swap/keys/newcamd.list.mgcamd ]; then
+	echo "remove ipk newcamd.list"
+	rm /var/swap/keys/newcamd.list
+fi
+
+if [ ! -e /var/swap/keys/peer.cfg.mgcamd ]; then
+	echo "remove ipk peer.cfg"
+	rm /var/swap/keys/peer.cfg
+fi
+
+if [ ! -e /var/swap/keys/priority.list.mgcamd ]; then
+	echo "remove ipk priority.list"
+	rm /var/swap/keys/priority.list
+fi
+
+if [ ! -e /var/swap/keys/replace.list.mgcamd ]; then
+	echo "remove ipk replace.list"
+	rm /var/swap/keys/replace.list
+fi
+
 sync
-
+echo "Removing mgcamd 4736 from Swapstick"
 exit 0
Index: ipk/source/swapemus_mgcamd_1_35/var/swap/etc/mgcamd_1.35.emu
===================================================================
--- ipk/source/swapemus_mgcamd_1_35/var/swap/etc/mgcamd_1.35.emu	(revision 6357)
+++ 	(revision )
@@ -1,4 +1,0 @@
-emuname  =MgCamd Version 1.35
-binname  =mgcamd_1.35
-startcam =/var/emu/mgcamd_1.35 &
-stopcam  =killall -9 mgcamd_1.35
Index: ipk/source/swapemus_mgcamd_1_35/var/swap/etc/mgcamd_1.35_swap.emu
===================================================================
--- ipk/source/swapemus_mgcamd_1_35/var/swap/etc/mgcamd_1.35_swap.emu	(revision 6678)
+++ ipk/source/swapemus_mgcamd_1_35/var/swap/etc/mgcamd_1.35_swap.emu	(revision 6678)
@@ -0,0 +1,4 @@
+emuname  =MgCamd Version 1.35
+binname  =mgcamd_1.35_swap
+startcam =/var/emu/mgcamd_1.35_swap &
+stopcam  =killall -9 mgcamd_1.35_swap