Merge branch 'master' into pull_request_workflow

Merged because master merged with upstream
This commit is contained in:
fujiwara 2017-02-11 17:11:32 +09:00
commit c73dae8300
3 changed files with 12 additions and 7 deletions

View File

@ -24,7 +24,7 @@ passwd -u root
# Vagrant setup # Vagrant setup
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers 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 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
mkdir -m 0700 -p ~vagrant/.ssh mkdir -m 0700 -p ~vagrant/.ssh
cat > ~vagrant/.ssh/authorized_keys << EOKEYS cat > ~vagrant/.ssh/authorized_keys << EOKEYS

View File

@ -18,15 +18,20 @@ hexchat
transmission transmission
parole parole
# mp3 support
gstreamer1-plugin-mpg123
# make sure we have a graphical installer # 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 # extra backgrounds
desktop-backgrounds-basic desktop-backgrounds-basic
f25-backgrounds-extras-gnome f25-backgrounds-extras-gnome
# save some space
-fedora-icon-theme
-PackageKit* # we switched to yumex, so we don't need this
%end %end

View File

@ -45,7 +45,7 @@ systemctl mask cloud-init cloud-init-local cloud-config cloud-final
# Vagrant setup # Vagrant setup
sed -i 's,Defaults\\s*requiretty,Defaults !requiretty,' /etc/sudoers 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 sed -i 's/.*UseDNS.*/UseDNS no/' /etc/ssh/sshd_config
mkdir -m 0700 -p ~vagrant/.ssh mkdir -m 0700 -p ~vagrant/.ssh
cat > ~vagrant/.ssh/authorized_keys << EOKEYS cat > ~vagrant/.ssh/authorized_keys << EOKEYS