diff options
| -rw-r--r-- | dracut/adduser.sh | 16 | ||||
| -rw-r--r-- | dracut/locale.sh | 2 | ||||
| -rw-r--r-- | mklive.sh.in | 2 |
3 files changed, 16 insertions, 4 deletions
diff --git a/dracut/adduser.sh b/dracut/adduser.sh index 246b20d..4b7acb3 100644 --- a/dracut/adduser.sh +++ b/dracut/adduser.sh @@ -4,6 +4,8 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh +echo void-live > ${NEWROOT}/etc/hostname + USERNAME=$(getarg live.user) [ -z "$USERNAME" ] && USERNAME=anon @@ -12,16 +14,24 @@ 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 \ - systemd-journal,wheel -s /bin/bash +chroot ${NEWROOT} useradd -c $USERNAME -m $USERNAME -G systemd-journal,wheel -s /bin/bash chroot ${NEWROOT} passwd -d $USERNAME >/dev/null 2>&1 +# Setup default root password (voidlinux). +chroot ${NEWROOT} sh -c 'echo "root:voidlinux" | chpasswd -c SHA512' + # Enable sudo permission by default. if [ -f ${NEWROOT}/etc/sudoers ]; then echo "${USERNAME} ALL=(ALL) NOPASSWD: ALL" >> ${NEWROOT}/etc/sudoers fi -# Enable autologin for agetty(8). +# Enable autologin for agetty(8) on tty1 and disable pam_systemd. +if [ -d ${NEWROOT}/etc/runit ]; then + sed -e "s|\-8|& -a $USERNAME|g" -i ${NEWROOT}/etc/sv/agetty-tty1/run + sed -e '/systemd/d' -i ${NEWROOT}/etc/pam.d/* +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/getty@tty1.service" sed -e "s|/sbin/agetty --noclear|& -a ${USERNAME}|g" \ diff --git a/dracut/locale.sh b/dracut/locale.sh index d7f5190..4ba1dd2 100644 --- a/dracut/locale.sh +++ b/dracut/locale.sh @@ -18,5 +18,5 @@ KEYMAP=$(getarg vconsole.keymap) if [ -f ${NEWROOT}/etc/vconsole.conf ]; then sed -e "s,^KEYMAP=.*,KEYMAP=$KEYMAP," -i $NEWROOT/etc/vconsole.conf elif [ -f ${NEWROOT}/etc/rc.conf ]; then - sed -e "s,^KEYMAP=.*,KEYMAP=$KEYMAP," -i $NEWROOT/etc/rc.conf.conf + sed -e "s,^#KEYMAP=.*,KEYMAP=$KEYMAP," -i $NEWROOT/etc/rc.conf fi diff --git a/mklive.sh.in b/mklive.sh.in index d47f611..e1cd209 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -123,6 +123,8 @@ install_packages() { else install -Dm755 /usr/sbin/void-installer $ROOTFS/usr/sbin/void-installer fi + # Cleanup and remove useless stuff. + rm -rf $ROOTFS/var/cache/* $ROOTFS/run/* $ROOTFS/var/run/* } copy_dracut_files() { |