-# Restore usual Debian behaviour which has been changed
-# for FAI via /etc/grml/fai/config/hooks/instsoft.GRMLBASE
-if [ -r $target/etc/apt/apt.conf ] ; then
- sed -i "s#Acquire::http::Pipeline-Depth.*#// &#" $target/etc/apt/apt.conf
+# Restore usual Debian behaviour
+#if [ -r "$target"/etc/apt/apt.conf.d/15grml-live ] ; then
+# rm -f "$target"/etc/apt/apt.conf.d/15grml-live
+#fi
+
+# Restore original state from softupdate:
+if [ -r $target/etc/policy-rc.d.conf ] ; then
+ sed -i "s/EXITSTATUS='101'/EXITSTATUS='0'/" $target/etc/policy-rc.d.conf
+fi
+
+# remove an existing /etc/debian_chroot file:
+if [ -r $target/etc/debian_chroot ] ; then
+ rm -f $target/etc/debian_chroot