From b4acbdc33757376f3571484c122b4f6f9a121161 Mon Sep 17 00:00:00 2001 From: Dennis Gilmore Date: Mon, 20 Feb 2017 08:00:14 -0600 Subject: [PATCH] Revert "Revert "Merge branch 'master' into pull_request_workflow"" This reverts commit 04ff19c726f993bd0521ab60c6c75d0b83caa716. --- fedora-atomic-vagrant.ks | 2 +- fedora-cinnamon-common.ks | 15 ++++++++++----- fedora-cloud-base-vagrant.ks | 2 +- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/fedora-atomic-vagrant.ks b/fedora-atomic-vagrant.ks index 1adefc4..ea9fc02 100644 --- a/fedora-atomic-vagrant.ks +++ b/fedora-atomic-vagrant.ks @@ -24,7 +24,7 @@ passwd -u root # Vagrant setup sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers -echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd +echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config mkdir -m 0700 -p ~vagrant/.ssh cat > ~vagrant/.ssh/authorized_keys << EOKEYS diff --git a/fedora-cinnamon-common.ks b/fedora-cinnamon-common.ks index 8767a63..5df0012 100644 --- a/fedora-cinnamon-common.ks +++ b/fedora-cinnamon-common.ks @@ -18,15 +18,20 @@ hexchat transmission parole +# mp3 support +gstreamer1-plugin-mpg123 + # make sure we have a graphical installer -yumex-dnf +gnome-software # for update-notification +dnfdragora # for graphical (GTK and ncurses) package-management +libyui-mga-gtk # GTK3-frontend for dnfdragora (graphical use) +libyui-mga-ncurses # Ncurses-frontend for dnfdragora (text-mode use) + +# nifty for installing not-found cli-commands +PackageKit-command-not-found # extra backgrounds desktop-backgrounds-basic f25-backgrounds-extras-gnome -# save some space --fedora-icon-theme --PackageKit* # we switched to yumex, so we don't need this - %end diff --git a/fedora-cloud-base-vagrant.ks b/fedora-cloud-base-vagrant.ks index 855bfee..27651b7 100644 --- a/fedora-cloud-base-vagrant.ks +++ b/fedora-cloud-base-vagrant.ks @@ -45,7 +45,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final # Vagrant setup sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers -echo 'vagrant ALL=NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd +echo 'vagrant ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config mkdir -m 0700 -p ~vagrant/.ssh cat > ~vagrant/.ssh/authorized_keys << EOKEYS