Move login-inner to usr/lib

src/pkgs/bootstrap.nix

@@ -20,7 +20,7 @@ buildPkgs.runCommand "bootstrap" { } ''
   install -D -m 0755 ${proot}/bin/proot $out/bin/proot
 
   cp ${files.login}/bin/login $out/bin/login
-  cp ${files.login-inner}/bin/login-inner $out/bin/login-inner
+  cp ${files.login-inner}/usr/lib/login-inner $out/usr/lib/login-inner
 
   cp ${files.home-nix-default}/etc/home.nix.default $out/etc/home.nix.default
   cp ${files.nix-conf}/etc/nix/nix.conf $out/etc/nix/nix.conf

src/pkgs/files/login-inner.nix

@@ -3,12 +3,12 @@
 
 { initialBuild, instDir, packageInfo, writeTextDir }:
 
-writeTextDir "bin/login-inner" ''
+writeTextDir "usr/lib/login-inner" ''
   set -e
 
   [ "$#" -gt 1 ] || echo "Welcome to Nix-on-Droid!"
 
-  [ "$#" -gt 1 ] || echo "If nothing works, use the rescue shell and read ${instDir}/bin/login-inner"
+  [ "$#" -gt 1 ] || echo "If nothing works, use the rescue shell and read ${instDir}/usr/lib/login-inner"
   [ "$#" -gt 1 ] || echo "If it does not help, report bugs at https://github.com/t184256/nix-on-droid-bootstrap/issues"
 
   export USER="$1"

src/pkgs/files/login.nix

@@ -31,5 +31,5 @@ writeScriptBin "login" ''
     -b ${instDir}/usr:/usr \
     -b /:/android \
     --link2symlink \
-    ${instDir}/bin/sh ${instDir}/bin/login-inner $USER "$@"
+    ${instDir}/bin/sh ${instDir}/usr/lib/login-inner $USER "$@"
 ''

src/pkgs/files/nix-on-droid-linker.nix

@@ -16,7 +16,7 @@ writeScriptBin "nix-on-droid-linker" ''
     ${coreutils}/bin/ln -snf $HOME/.nix-profile/$from /$to
   }
 
-  for i in login login-inner proot sh; do
+  for i in login sh; do
     link bin/$i bin/$i
   done
 
@@ -25,4 +25,5 @@ writeScriptBin "nix-on-droid-linker" ''
   done
 
   link bin/env usr/bin/env
+  link usr/lib/login-inner usr/lib/login-inner
 ''