From 36dedbf1f44069d995130970a3afca44de4da494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Hertzog?= Date: Thu, 5 Apr 2018 18:34:20 +0200 Subject: [PATCH] Revert "Disable root user by default, use "kali" user in live mode" This reverts commit c257ad007f7a494db754af1e8527bc0e2bd7daf2. --- auto/config | 4 ++-- kali-config/common/hooks/live/forensic-menu.binary | 2 +- kali-config/common/hooks/live/persistence-menu.binary | 4 ++-- .../includes.chroot/usr/lib/live/config/0031-root-password | 5 +++++ .../usr/lib/live/config/1165-fix-openssh-server | 3 +++ kali-config/common/includes.installer/preseed.cfg | 4 ++-- 6 files changed, 15 insertions(+), 7 deletions(-) create mode 100755 kali-config/common/includes.chroot/usr/lib/live/config/0031-root-password diff --git a/auto/config b/auto/config index 4da05e0..991eada 100755 --- a/auto/config +++ b/auto/config @@ -136,8 +136,8 @@ lb config noauto \ --iso-volume "Kali Live" \ --linux-packages linux-image \ --memtest memtest86 \ - --bootappend-live "boot=live components splash username=kali hostname=kali" \ - --bootappend-live-failsafe "boot=live components username=kali hostname=kali memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" \ + --bootappend-live "boot=live components splash username=root hostname=kali" \ + --bootappend-live-failsafe "boot=live components username=root hostname=kali memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" \ --bootappend-install "net.ifnames=0" \ --security false \ $lb_opts \ diff --git a/kali-config/common/hooks/live/forensic-menu.binary b/kali-config/common/hooks/live/forensic-menu.binary index e01ab3f..d0c764b 100755 --- a/kali-config/common/hooks/live/forensic-menu.binary +++ b/kali-config/common/hooks/live/forensic-menu.binary @@ -10,6 +10,6 @@ label live-forensic menu label Live (^forensic mode) linux /live/vmlinuz initrd /live/initrd.img - append boot=live username=kali hostname=kali noswap noautomount + append boot=live noconfig=sudo username=root hostname=kali noswap noautomount END diff --git a/kali-config/common/hooks/live/persistence-menu.binary b/kali-config/common/hooks/live/persistence-menu.binary index 1013283..30a398b 100755 --- a/kali-config/common/hooks/live/persistence-menu.binary +++ b/kali-config/common/hooks/live/persistence-menu.binary @@ -10,13 +10,13 @@ label live-persistence menu label ^Live USB Persistence (check kali.org/prst) linux /live/vmlinuz initrd /live/initrd.img - append boot=live username=kali hostname=kali persistence + append boot=live noconfig=sudo username=root hostname=kali persistence label live-encrypted-persistence menu label ^Live USB Encrypted Persistence (check kali.org/prst) linux /live/vmlinuz initrd /live/initrd.img - append boot=live persistent=cryptsetup persistence-encryption=luks username=kali hostname=kali persistence + append boot=live persistent=cryptsetup persistence-encryption=luks noconfig=sudo username=root hostname=kali persistence END diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/0031-root-password b/kali-config/common/includes.chroot/usr/lib/live/config/0031-root-password new file mode 100755 index 0000000..02bdc52 --- /dev/null +++ b/kali-config/common/includes.chroot/usr/lib/live/config/0031-root-password @@ -0,0 +1,5 @@ +#!/bin/sh + +# Set "toor" as root password +usermod -p 'X014elvznJq7E' root + diff --git a/kali-config/common/includes.chroot/usr/lib/live/config/1165-fix-openssh-server b/kali-config/common/includes.chroot/usr/lib/live/config/1165-fix-openssh-server index 30b9ac8..69df58e 100755 --- a/kali-config/common/includes.chroot/usr/lib/live/config/1165-fix-openssh-server +++ b/kali-config/common/includes.chroot/usr/lib/live/config/1165-fix-openssh-server @@ -2,3 +2,6 @@ # Allow PasswordAuthentification in sshd config sed -i -e 's|#\?\(PasswordAuthentication\) no|\1 yes|' /etc/ssh/sshd_config + +# Allow root login with password +sed -i -e 's|#\?\(PermitRootLogin\) prohibit-password|\1 yes|' /etc/ssh/sshd_config diff --git a/kali-config/common/includes.installer/preseed.cfg b/kali-config/common/includes.installer/preseed.cfg index a5cf8b0..7e43287 100644 --- a/kali-config/common/includes.installer/preseed.cfg +++ b/kali-config/common/includes.installer/preseed.cfg @@ -31,8 +31,8 @@ d-i pkgsel/upgrade select full-upgrade # d-i netcfg/get_hostname string kali # d-i netcfg/get_hostname seen false -# Disable the root user entirely -d-i passwd/root-login boolean false +# Do not create a normal user account +# d-i passwd/make-user boolean false # Enable eatmydata in kali-installer to boost speed installation d-i preseed/early_command string anna-install eatmydata-udeb