From ee278af7ee45cc0f1bea2c6d1679d244d50b9193 Mon Sep 17 00:00:00 2001 From: Stefan Scherer Date: Sun, 25 Mar 2018 18:57:36 +0200 Subject: [PATCH] Revert "Set useradd default shell to bash" This reverts commit 554cfddf524aa9afdd0794fed66d28c926b6159f. Strange behaviour: useradd creates user without a shell which defaults to /bin/sh. --- builder/chroot-script.sh | 3 --- .../spec/hypriotos-image/base/users_spec.rb | 6 ------ 2 files changed, 9 deletions(-) diff --git a/builder/chroot-script.sh b/builder/chroot-script.sh index a5f208e..1455959 100644 --- a/builder/chroot-script.sh +++ b/builder/chroot-script.sh @@ -178,9 +178,6 @@ proc /proc proc defaults 0 0 /dev/mmcblk0p2 / ext4 defaults,noatime 0 1 " > /etc/fstab -# Fix default shell for new users created with useradd -sed -i 's,SHELL=/bin/sh,SHELL=/bin/bash,' /etc/default/useradd - # as the Pi does not have a hardware clock we need a fake one apt-get install -y \ --no-install-recommends \ diff --git a/builder/test-integration/spec/hypriotos-image/base/users_spec.rb b/builder/test-integration/spec/hypriotos-image/base/users_spec.rb index 5b6bbe4..1586cba 100644 --- a/builder/test-integration/spec/hypriotos-image/base/users_spec.rb +++ b/builder/test-integration/spec/hypriotos-image/base/users_spec.rb @@ -49,9 +49,3 @@ it { should be_mode 644 } it { should be_owned_by 'pirate' } end - -describe file('/etc/default/useradd') do - it { should be_file } - it { should be_owned_by 'root' } - its(:content) { should contain /SHELL=\/bin\/bash/ } -end