From 14381901e4c9fc1000fd6b4f6095cf4aa8ae1a1b Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Sat, 20 Sep 2014 11:48:49 +0200
Subject: mklive: accept live.shell kernel cmdline to switch user shell; from
 pancake.

---
 dracut/adduser.sh | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

(limited to 'dracut')

diff --git a/dracut/adduser.sh b/dracut/adduser.sh
index 9dd7ddc..8269730 100644
--- a/dracut/adduser.sh
+++ b/dracut/adduser.sh
@@ -7,14 +7,20 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 echo void-live > ${NEWROOT}/etc/hostname
 
 USERNAME=$(getarg live.user)
+USERSHELL=$(getarg live.shell)
 [ -z "$USERNAME" ] && USERNAME=anon
+[ -z "$USERSHELL" ] && USERSHELL=/bin/sh
 
 # Create /etc/default/live.conf to store USER.
 echo "USERNAME=$USERNAME" >> ${NEWROOT}/etc/default/live.conf
 chmod 644 ${NEWROOT}/etc/default/live.conf
 
+if ! grep -q ${USERSHELL} ${NEWROOT}/etc/shells ; then
+    echo ${USERSHELL} >> ${NEWROOT}/etc/shells
+fi
+
 # Create new user and remove password. We'll use autologin by default.
-chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G wheel -s /bin/sh
+chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G wheel -s $USERSHELL
 chroot ${NEWROOT} passwd -d $USERNAME >/dev/null 2>&1
 
 # Setup default root password (voidlinux).
-- 
cgit 1.4.1