Merge remote-tracking branch 'x86/pie-x86' into q-x86

Conflicts:
	initrd/init

diff --cc initrd/init
index 1e42668,dd775e6..16aaed2
--- 1/initrd/init
--- 2/initrd/init
+++ b/initrd/init
@@@ -131,9 -138,10 +129,10 @@@ debug_shell(
        if [ -x system/bin/sh ]; then
                echo Running MirBSD Korn Shell...
                USER="($1)" system/bin/sh -l 2>&1
+               [ $? -ne 0 ] && /bin/sh 2>&1
        else
                echo Running busybox ash...
 -              sh 2>&1
 +              busybox sh 2>&1
        fi
  }
  

diff --cc install/scripts/1-install
index 4964545,8487aa8..951f282
--- 1/install/scripts/1-install
--- 2/install/scripts/1-install
+++ b/install/scripts/1-install
@@@ -512,10 -517,10 +517,10 @@@ install_to(
        for s in `du -sk $files | awk '{print $1}'`; do
                size=$(($size+$s))
        done
-       try_upgrade hd/$asrc
+ 
        mkdir -p hd/$asrc
        cd hd/$asrc
 -      rm -rf system*
 +      rm -rf system* *.img
        ( ( cd /; find $files | $CPIO -H newc -o ) | pv -ns ${size}k | ( $CPIO -iud > /dev/null; echo $? > /tmp/result )) 2>&1 \
                | progress_bar "Installing $OS_TITLE to $1" "Expect to write $size KB..."
        result=$((`cat /tmp/result`*255))