Skip to content

shadow: use /bin/sh as default shell #432117

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fabianhjr merged 1 commit into from
Aug 13, 2025
Merged

shadow: use /bin/sh as default shell #432117

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions nixos/tests/sssd-ldap.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ import ./make-test-python.nix (
objectClass: posixAccount
userPassword: ${testPassword}
homeDirectory: /home/${testUser}
loginShell: /run/current-system/sw/bin/bash
uidNumber: 1234
gidNumber: 1234
cn: ""
Expand Down
11 changes: 6 additions & 5 deletions pkgs/by-name/sh/shadow/package.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
lib,
stdenv,
fetchFromGitHub,
runtimeShell,
nixosTests,
autoreconfHook,
bison,
Expand Down Expand Up @@ -49,8 +48,6 @@ stdenv.mkDerivation rec {
"man"
];

RUNTIME_SHELL = runtimeShell;

nativeBuildInputs = [
autoreconfHook
bison
Expand All @@ -74,13 +71,17 @@ stdenv.mkDerivation rec {
./keep-path.patch
# Obtain XML resources from XML catalog (patch adapted from gtk-doc)
./respect-xml-catalog-files-var.patch
./runtime-shell.patch
./fix-install-with-tcb.patch
];

# The nix daemon often forbids even creating set[ug]id files.
postPatch = ''
# The nix daemon often forbids even creating set[ug]id files
sed 's/^\(s[ug]idperms\) = [0-9]755/\1 = 0755/' -i src/Makefile.am

# The default shell is not defined at build time of the package. It is
# decided at build time of the NixOS configration. Thus, don't decide this
# here but just point to the location of the shell on the system.
substituteInPlace configure.ac --replace-fail '$SHELL' /bin/sh
'';

# `AC_FUNC_SETPGRP' is not cross-compilation capable.
Expand Down
13 changes: 0 additions & 13 deletions pkgs/by-name/sh/shadow/runtime-shell.patch
View file
Open in desktop

This file was deleted.

Loading