Re: [Nix-dev] [PATCH 2/2] nixos-install: Fix chroot flag not defaulting to Bash outside NixOS.

2015-04-28 Thread Domen Kožar
So https://github.com/NixOS/nixpkgs/pull/7603 can be closed as well. Thank
you Jookia and Shea!

On Tue, Apr 28, 2015 at 12:38 PM, Shea Levy s...@shealevy.com wrote:

 Applied in 71910be9ea225895e36f60ed23a1bdce402b3088, thanks!

  On Apr 27, 2015, at 10:16 PM, Jookia 166...@gmail.com wrote:
 
  Passing the chroot flag to nixos-install without arguments should now
 give you a
  Bash shell as intended rather than try an empty path.
 
  This was masked by the user's shell (usually /bin/bash) being defaulted
 to by
  chroot, and being found since their paths used NixOS conventions.
  ---
  nixos/modules/installer/tools/nixos-install.sh | 4 +++-
  1 file changed, 3 insertions(+), 1 deletion(-)
 
  diff --git a/nixos/modules/installer/tools/nixos-install.sh
 b/nixos/modules/installer/tools/nixos-install.sh
  index 86e57f7..097631e 100644
  --- a/nixos/modules/installer/tools/nixos-install.sh
  +++ b/nixos/modules/installer/tools/nixos-install.sh
  @@ -45,7 +45,9 @@ while [ $# -gt 0 ]; do
  ;;
  --chroot)
  runChroot=1
  -chrootCommand=($@)
  +if [[ $@ !=  ]]; then
  +chrootCommand=($@)
  +fi
  break
  ;;
  --help)
  --
  2.3.6
 
  ___
  nix-dev mailing list
  nix-dev@lists.science.uu.nl
  http://lists.science.uu.nl/mailman/listinfo/nix-dev

 ___
 nix-dev mailing list
 nix-dev@lists.science.uu.nl
 http://lists.science.uu.nl/mailman/listinfo/nix-dev

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


Re: [Nix-dev] [PATCH 2/2] nixos-install: Fix chroot flag not defaulting to Bash outside NixOS.

2015-04-28 Thread Shea Levy
Applied in 71910be9ea225895e36f60ed23a1bdce402b3088, thanks!

 On Apr 27, 2015, at 10:16 PM, Jookia 166...@gmail.com wrote:
 
 Passing the chroot flag to nixos-install without arguments should now give 
 you a
 Bash shell as intended rather than try an empty path.
 
 This was masked by the user's shell (usually /bin/bash) being defaulted to by
 chroot, and being found since their paths used NixOS conventions.
 ---
 nixos/modules/installer/tools/nixos-install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/nixos/modules/installer/tools/nixos-install.sh 
 b/nixos/modules/installer/tools/nixos-install.sh
 index 86e57f7..097631e 100644
 --- a/nixos/modules/installer/tools/nixos-install.sh
 +++ b/nixos/modules/installer/tools/nixos-install.sh
 @@ -45,7 +45,9 @@ while [ $# -gt 0 ]; do
 ;;
 --chroot)
 runChroot=1
 -chrootCommand=($@)
 +if [[ $@ !=  ]]; then
 +chrootCommand=($@)
 +fi
 break
 ;;
 --help)
 -- 
 2.3.6
 
 ___
 nix-dev mailing list
 nix-dev@lists.science.uu.nl
 http://lists.science.uu.nl/mailman/listinfo/nix-dev

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev


[Nix-dev] [PATCH 2/2] nixos-install: Fix chroot flag not defaulting to Bash outside NixOS.

2015-04-27 Thread Jookia
Passing the chroot flag to nixos-install without arguments should now give you a
Bash shell as intended rather than try an empty path.

This was masked by the user's shell (usually /bin/bash) being defaulted to by
chroot, and being found since their paths used NixOS conventions.
---
 nixos/modules/installer/tools/nixos-install.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/installer/tools/nixos-install.sh 
b/nixos/modules/installer/tools/nixos-install.sh
index 86e57f7..097631e 100644
--- a/nixos/modules/installer/tools/nixos-install.sh
+++ b/nixos/modules/installer/tools/nixos-install.sh
@@ -45,7 +45,9 @@ while [ $# -gt 0 ]; do
 ;;
 --chroot)
 runChroot=1
-chrootCommand=($@)
+if [[ $@ !=  ]]; then
+chrootCommand=($@)
+fi
 break
 ;;
 --help)
-- 
2.3.6

___
nix-dev mailing list
nix-dev@lists.science.uu.nl
http://lists.science.uu.nl/mailman/listinfo/nix-dev