Переглянути джерело

mklive: set live user shell to /bin/sh; use /etc/issue; disable autologin.

Juan RP 10 роки тому
батько
коміт
ab3a398875
3 змінених файлів з 4 додано та 23 видалено
  1. 2 4
      data/issue
  2. 1 16
      dracut/adduser.sh
  3. 1 3
      mklive.sh.in

+ 2 - 4
data/motd → data/issue

@@ -1,12 +1,10 @@
 ###############################################################################
 
-Welcome to the Void Linux Live system, you have been autologged in.
-This user has full sudo(8) permissions without any password, be careful
-executing commands through sudo(8).
+Welcome to the Void Linux Live system, the `root` password is `voidlinux`.
 
 To start the installation please type:
 
-    $ sudo void-installer
+    $ void-installer
 
 and follow the on-screen instructions. Thanks for using Void Linux.
 

+ 1 - 16
dracut/adduser.sh

@@ -14,7 +14,7 @@ echo "USERNAME=$USERNAME" >> ${NEWROOT}/etc/default/live.conf
 chmod 644 ${NEWROOT}/etc/default/live.conf
 
 # Create new user and remove password. We'll use autologin by default.
-chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G wheel -s /bin/bash
+chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G wheel -s /bin/sh
 chroot ${NEWROOT} passwd -d $USERNAME >/dev/null 2>&1
 
 # Setup default root password (voidlinux).
@@ -25,21 +25,6 @@ if [ -f ${NEWROOT}/etc/sudoers ]; then
     echo "${USERNAME}  ALL=(ALL) NOPASSWD: ALL" >> ${NEWROOT}/etc/sudoers
 fi
 
-# Enable autologin for agetty(8) on tty1 with runit.
-if [ -d ${NEWROOT}/etc/runit ]; then
-    sed "s|agetty|& -a $USERNAME|" -i ${NEWROOT}/etc/sv/agetty-tty1/run
-fi
-
-# Enable autologin for agetty(8) on tty1 with systemd.
-if [ -d ${NEWROOT}/etc/systemd/system ]; then
-    rm -f "${NEWROOT}/etc/systemd/system/getty.target.wants/[email protected]"
-    sed -e "s|/sbin/agetty --noclear|& -a ${USERNAME}|g" \
-        "${NEWROOT}/usr/lib/systemd/system/[email protected]" > \
-        "${NEWROOT}/etc/systemd/system/[email protected]"
-    ln -sf /etc/systemd/system/[email protected] \
-        "${NEWROOT}/etc/systemd/system/getty.target.wants/[email protected]"
-fi
-
 if [ -d ${NEWROOT}/etc/polkit-1 ]; then
     # If polkit is installed allow users in the wheel group to run anything.
     cat > ${NEWROOT}/etc/polkit-1/rules.d/void-live.rules <<_EOF

+ 1 - 3
mklive.sh.in

@@ -314,11 +314,9 @@ install_prereqs
 info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..."
 install_packages
 
-#
-# Prepare /etc/motd.
-#
 mkdir -p "$ROOTFS"/etc
 [ -s data/motd ] && cp data/motd $ROOTFS/etc
+[ -s data/issue ] && cp data/issue $ROOTFS/etc
 
 export PATH=$VOIDHOSTDIR/usr/bin:$VOIDHOSTDIR/usr/sbin:$PATH
 export LD_LIBRARY_PATH=$VOIDHOSTDIR/usr/lib