From 25c1d265ada3be8fcfab1d0373d2077aa45e14b2 Mon Sep 17 00:00:00 2001 From: Tobias Happ Date: Sat, 5 Oct 2019 01:55:47 +0200 Subject: [PATCH] Remove USER parameter in login-inner --- src/pkgs/files/login-inner.nix | 3 +-- src/pkgs/files/login.nix | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pkgs/files/login-inner.nix b/src/pkgs/files/login-inner.nix index 22c32aa..b762a25 100644 --- a/src/pkgs/files/login-inner.nix +++ b/src/pkgs/files/login-inner.nix @@ -11,9 +11,8 @@ writeTextDir "usr/lib/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" + export USER=nix-on-droid export HOME="/data/data/com.termux.nix/files/home" - shift ${ if initialBuild diff --git a/src/pkgs/files/login.nix b/src/pkgs/files/login.nix index 4f41f45..1222523 100644 --- a/src/pkgs/files/login.nix +++ b/src/pkgs/files/login.nix @@ -31,5 +31,5 @@ writeScriptBin "login" '' -b ${instDir}/usr:/usr \ -b /:/android \ --link2symlink \ - ${instDir}/bin/sh ${instDir}/usr/lib/login-inner $USER "$@" + ${instDir}/bin/sh ${instDir}/usr/lib/login-inner "$@" ''