From 04ff19c726f993bd0521ab60c6c75d0b83caa716 Mon Sep 17 00:00:00 2001
From: Dennis Gilmore <dennis@ausil.us>
Date: Feb 19 2017 00:07:26 +0000
Subject: Revert "Merge branch 'master' into pull_request_workflow"


This reverts commit c73dae83003e6f8bf3cf27093bd15789cc751c8a, reversing
changes made to 6ed0f650393d2b45bbfc36ff67cf08194481aeef.

---

diff --git a/fedora-atomic-vagrant.ks b/fedora-atomic-vagrant.ks
index ea9fc02..1adefc4 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=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant 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 5df0012..8767a63 100644
--- a/fedora-cinnamon-common.ks
+++ b/fedora-cinnamon-common.ks
@@ -18,20 +18,15 @@ hexchat
 transmission
 parole
 
-# mp3 support
-gstreamer1-plugin-mpg123
-
 # make sure we have a graphical installer
-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
+yumex-dnf
 
 # 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 27651b7..855bfee 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=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/vagrant-nopasswd
+echo 'vagrant 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