Index: ipk/source/swapemus_incubus_1_22/CONTROL/postinst
===================================================================
--- ipk/source/swapemus_incubus_1_22/CONTROL/postinst	(revision 6357)
+++ ipk/source/swapemus_incubus_1_22/CONTROL/postinst	(revision 6678)
@@ -1,27 +1,48 @@
 #!/bin/sh
-TMP=/tmp/.keys
+TMP=/tmp/.incubus
+PLUGINDIR=/var/swap/bin
+CONFIGDIR=/var/swap/etc
 PLUGINDIR=/var/swap/keys
-PLUGINDIR=/var/swap/bin
-CONFIGDIR=/var/etc
-
-echo "Make Symlinks......."
-ln -s /var/swap/bin/incubuscamd_1.22 /var/bin/incubuscamd_1.22
-ln -s /var/swap/keys/incubusCamd.channelinfo /var/keys/incubusCamd.channelinfo
-ln -s /var/swap/keys/incubusCamd.conf /var/keys/incubusCamd.conf
-ln -s /var/swap/keys/incubusCamd.prio /var/keys/incubusCamd.prio
-ln -s /var/swap/keys/incubusCamd.providers /var/keys/incubusCamd.providers
 
 
+if [ ! -e /var/swap/keys/incubusCamd.channelinfo ]; then
+	echo "use ipk config file: incubusCamd.channelinfo"
+	echo "rename /var/swap/keys/incubusCamd.channelinfo.incubus > /var/swap/keys/incubusCamd.channelinfo"
+	mv /var/swap/keys/incubusCamd.channelinfo.incubus /var/swap/keys/incubusCamd.channelinfo
+else
+	echo "found user config file: incubusCamd.channelinfo"
+	echo "skip ipk config file: incubusCamd.channelinfo.incubus"
+fi
 
+if [ ! -e /var/swap/keys/incubusCamd.conf ]; then
+	echo "use ipk config file: incubusCamd.conf"
+	echo "rename /var/swap/keys/incubusCamd.conf.incubus > /var/swap/keys/incubusCamd.conf"
+	mv /var/swap/keys/incubusCamd.conf.incubus /var/swap/keys/incubusCamd.conf
+else
+	echo "found user config file: incubusCamd.conf"
+	echo "skip ipk config file: incubusCamd.conf.incubus"
+fi
+
+if [ ! -e /var/swap/keys/incubusCamd.prio ]; then
+	echo "use ipk config file: incubusCamd.prio"
+	echo "rename /var/swap/keys/incubusCamd.prio.incubus > /var/swap/keys/incubusCamd.prio"
+	mv /var/swap/keys/incubusCamd.prio.incubus /var/swap/keys/incubusCamd.prio
+else
+	echo "found user config file: incubusCamd.prio"
+	echo "skip ipk config file: incubusCamd.prio.incubus"
+fi
+
+if [ ! -e /var/swap/keys/incubusCamd.providers ]; then
+	echo "use ipk config file: incubusCamd.providers"
+	echo "rename /var/swap/keys/incubusCamd.providers.incubus > /var/swap/keys/incubusCamd.providers"
+	mv /var/swap/keys/incubusCamd.providers.incubus /var/swap/keys/incubusCamd.providers
+else
+	echo "found user config file: incubusCamd.providers"
+	echo "skip ipk config file: incubusCamd.providers.incubus"
+fi
 
 echo "successfully installed"
 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_incubus_1_22/CONTROL/postrm
===================================================================
--- ipk/source/swapemus_incubus_1_22/CONTROL/postrm	(revision 6357)
+++ ipk/source/swapemus_incubus_1_22/CONTROL/postrm	(revision 6678)
@@ -1,43 +1,9 @@
 #!/bin/sh
-TMP=/tmp/.keys
+TMP=/tmp/.incubus
+
+rm -r /var/swap/bin/incubuscamd_1.22_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
-
-if [ -e /var/swap/keys/incubusCamd.conf.bak ]; then
-	echo "renaming your saved incubusCamd.conf"
-	mv /var/swap/keys/incubusCamd.conf.bak /var/swap/keys/incubusCamd.conf
-fi
-
-if [ -e /var/swap/keys/incubusCamd.providers.bak ]; then
-	echo "renaming your saved incubusCamd.providers"
-	mv /var/swap/keys/incubusCamd.providers.bak /var/swap/keys/incubusCamd.providers
-fi
-
-if [ -e /var/swap/keys/incubusCamd.prio.bak ]; then
-	echo "renaming your saved incubusCamd.prio"
-	mv /var/swap/keys/incubusCamd.prio.bak /var/swap/keys/incubusCamd.prio
-fi
-
-if [ -e /var/swap/keys/incubusCamd.channelinfo.bak ]; then
-	echo "renaming your saved incubusCamd.channelinfo"
-	mv /var/swap/keys/incubusCamd.channelinfo.bak /var/swap/keys/incubusCamd.channelinfo
-fi
-
-echo "remove Symlinks"
-
-rm /var/bin/incubuscamd_1.22
-rm /var/keys/incubusCamd.channelinfo
-rm /var/keys/incubusCamd.conf
-rm /var/keys/incubusCamd.prio
-rm /var/keys/incubusCamd.providers
-
-
-sync
-
 exit 0
Index: ipk/source/swapemus_incubus_1_22/CONTROL/preinst
===================================================================
--- ipk/source/swapemus_incubus_1_22/CONTROL/preinst	(revision 6357)
+++ ipk/source/swapemus_incubus_1_22/CONTROL/preinst	(revision 6678)
@@ -1,5 +1,5 @@
 #!/bin/sh
 #
-TMP=/tmp/.keys
+TMP=/tmp/.incubus
 echo "syncing disk"
 sync
@@ -18,6 +18,4 @@
 fi
 
-
-
 echo "checking swapstick"
 if [ ! -d /var/swap/bin/ ]; then
@@ -27,6 +25,6 @@
 	exit 1
 fi
-echo "Swapstick found...."
-
+echo "swapstick found...."
+echo "installing Incubuscamd 1.22 to swapstick..."
 echo "checking OS"
 if  [ `cat /etc/motd | grep AAF | grep M | grep rev | wc -l` -eq 0 ]; then                      
@@ -39,52 +37,5 @@
 fi
 
+sync
 
-echo "Installing IncubusCamd to swapstick..."
-
-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`
-	SIZE=122
-	echo "checking freespace"
-	echo packege size $SIZE kb
-	echo freespace size $FREE kb
-	if  [ "$FREE" -lt "$SIZE" ]; then
-		echo "sorry no freespace left on device"
-		exit 1
-	else
-		echo ok
-	fi
-fi   
-echo "installing Incubus config 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
-
-if [ -e /var/swap/keys/incubusCamd.conf ]; then
-	echo "saving your actual incubusCamd.conf"
-	mv /var/swap/keys/incubusCamd.conf /var/swap/keys/incubusCamd.conf.bak
-fi
-
-if [ -e /var/swap/keys/incubusCamd.providers ]; then
-	echo "saving your actual incubusCamd.providers"
-	mv /var/swap/keys/incubusCamd.providers /var/swap/keys/incubusCamd.providers.bak
-fi
-
-if [ -e /var/swap/keys/incubusCamd.prio ]; then
-	echo "saving your actual incubusCamd.prio"
-	mv /var/swap/keys/incubusCamd.prio /var/swap/keys/incubusCamd.prio.bak
-fi
-
-if [ -e /var/swap/keys/incubusCamd.channelinfo ]; then
-	echo "saving your actual incubusCamd.channelinfo"
-	mv /var/swap/keys/incubusCamd.channelinfo /var/swap/keys/incubusCamd.channelinfo.bak
-fi
-
-sync
 exit 0
Index: ipk/source/swapemus_incubus_1_22/CONTROL/prerm
===================================================================
--- ipk/source/swapemus_incubus_1_22/CONTROL/prerm	(revision 6357)
+++ ipk/source/swapemus_incubus_1_22/CONTROL/prerm	(revision 6678)
@@ -1,11 +1,27 @@
 #!/bin/sh
-TMP=/tmp/.keys
+TMP=/tmp/.incubus
 echo "syncing disk"
+
+if [ ! -e /var/swap/keys/incubusCamd.channelinfo.incubus ]; then
+	echo "remove ipk incubusCamd.channelinfo"
+	rm /var/swap/keys/incubusCamd.channelinfo
+fi
+
+if [ ! -e /var/swap/keys/incubusCamd.conf.incubus ]; then
+	echo "remove ipk incubusCamd.conf"
+	rm /var/swap/keys/incubusCamd.conf
+fi
+
+if [ ! -e /var/swap/keys/incubusCamd.prio.incubus ]; then
+	echo "remove ipk incubusCamd.prio"
+	rm /var/swap/keys/incubusCamd.prio
+fi
+
+if [ ! -e /var/swap/keys/incubusCamd.providers.incubus ]; then
+	echo "remove ipk incubusCamd.providers"
+	rm /var/swap/keys/incubusCamd.providers
+fi
+
 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 freespace size $FREE kb
-fi
-echo "Removing Incubus and configs from Swapstick"
+echo "Removing Incubuscamd 1.22 from Swapstick"
 exit 0
Index: ipk/source/swapemus_incubus_1_22/var/swap/etc/IncubusCamd_1.22.emu
===================================================================
--- ipk/source/swapemus_incubus_1_22/var/swap/etc/IncubusCamd_1.22.emu	(revision 6357)
+++ 	(revision )
@@ -1,4 +1,0 @@
-emuname  =IncubusCamd Version 1.22
-binname  =incubuscamd_1.22
-startcam =/var/bin/incubusCamd_1.22 &
-stopcam  =killall -9 incubuscamd_1.22
Index: ipk/source/swapemus_incubus_1_22/var/swap/etc/IncubusCamd_1.22_swap.emu
===================================================================
--- ipk/source/swapemus_incubus_1_22/var/swap/etc/IncubusCamd_1.22_swap.emu	(revision 6678)
+++ ipk/source/swapemus_incubus_1_22/var/swap/etc/IncubusCamd_1.22_swap.emu	(revision 6678)
@@ -0,0 +1,4 @@
+emuname  =IncubusCamd Version 1.22_swap
+binname  =incubuscamd_1.22_swap
+startcam =/var/bin/incubusCamd_1.22_swap &
+stopcam  =killall -9 incubuscamd_1.22_swap