From d38606ec423d248c91787365e46d1763a9b7e3b9 Mon Sep 17 00:00:00 2001 From: Dusty Mabe Date: May 08 2017 15:38:45 +0000 Subject: atomic, cloud: don't create none user Anaconda doesn't seem to require it anymore so no need to create it and then delete it. (cherry picked from commit 4948e8c00265cb3fb934c867316d93960f2f6564) --- diff --git a/fedora-atomic.ks b/fedora-atomic.ks index 1f4e213..f63843e 100644 --- a/fedora-atomic.ks +++ b/fedora-atomic.ks @@ -14,7 +14,6 @@ timezone --utc Etc/UTC auth --useshadow --passalgo=sha512 selinux --enforcing rootpw --lock --iscrypted locked -user --name=none firewall --disabled @@ -47,8 +46,6 @@ ostree remote add --set=gpg-verify=false fedora-atomic 'https://kojipkgs.fedorap # older versions of livecd-tools do not follow "rootpw --lock" line above # https://bugzilla.redhat.com/show_bug.cgi?id=964299 passwd -l root -# remove the user anaconda forces us to make -userdel -r none # Work around https://bugzilla.redhat.com/show_bug.cgi?id=1193590 cp /etc/skel/.bash* /var/roothome diff --git a/fedora-cloud-base.ks b/fedora-cloud-base.ks index 8c0352e..af78d01 100644 --- a/fedora-cloud-base.ks +++ b/fedora-cloud-base.ks @@ -32,7 +32,6 @@ timezone --utc Etc/UTC auth --useshadow --passalgo=sha512 selinux --enforcing rootpw --lock --iscrypted locked -user --name=none firewall --disabled @@ -118,8 +117,6 @@ ln -sf /boot/grub/grub.conf /etc/grub.conf # older versions of livecd-tools do not follow "rootpw --lock" line above # https://bugzilla.redhat.com/show_bug.cgi?id=964299 passwd -l root -# remove the user anaconda forces us to make -userdel -r none # setup systemd to boot to the right runlevel echo -n "Setting default runlevel to multiuser text mode"