From 6361ea4c95f0ba7791f442b9b314877643c7f2f9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?=
 <marmarek@invisiblethingslab.com>
Date: Wed, 23 Jul 2014 04:45:11 +0200
Subject: [PATCH] rpm: mark config files with %config(noreplace)

---
 rpm_spec/core-vm.spec | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/rpm_spec/core-vm.spec b/rpm_spec/core-vm.spec
index 99394d9..d5fd886 100644
--- a/rpm_spec/core-vm.spec
+++ b/rpm_spec/core-vm.spec
@@ -97,6 +97,8 @@ mv /etc/fstab /var/lib/qubes/fstab.orig
 fi
 
 adduser --create-home user
+usermod -p '' root
+usermod -L user
 
 %install
 
@@ -174,9 +176,6 @@ echo 'OnlyShowIn=GNOME;QUBES;' >> /etc/xdg/autostart/nm-applet.desktop || :
 echo 'OnlyShowIn=GNOME;NetVM;' >> /etc/xdg/autostart/nm-applet.desktop || :
 %endif
 
-usermod -p '' root
-usermod -L user
-
 # Create NetworkManager configuration if we do not have it
 if ! [ -e /etc/NetworkManager/NetworkManager.conf ]; then
 echo '[main]' > /etc/NetworkManager/NetworkManager.conf
@@ -299,13 +298,13 @@ rm -f %{name}-%{version}
 %{kde_service_dir}/qvm-dvm.desktop
 /etc/NetworkManager/dispatcher.d/30-qubes-external-ip
 /etc/NetworkManager/dispatcher.d/qubes-nmhook
-/etc/X11/xorg-preload-apps.conf
+%config(noreplace) /etc/X11/xorg-preload-apps.conf
 /etc/dispvm-dotfiles.tbz
 /etc/dhclient.d/qubes-setup-dnat-to-ns.sh
 /etc/fstab
 /etc/pki/rpm-gpg/RPM-GPG-KEY-qubes*
-/etc/polkit-1/localauthority/50-local.d/qubes-allow-all.pkla
-/etc/polkit-1/rules.d/00-qubes-allow-all.rules
+%config(noreplace) /etc/polkit-1/localauthority/50-local.d/qubes-allow-all.pkla
+%config(noreplace) /etc/polkit-1/rules.d/00-qubes-allow-all.rules
 %dir /etc/qubes-rpc
 /etc/qubes-rpc/qubes.Filecopy
 /etc/qubes-rpc/qubes.OpenInVM
@@ -321,15 +320,15 @@ rm -f %{name}-%{version}
 /etc/qubes-rpc/qubes.SelectFile
 /etc/qubes-rpc/qubes.SelectDirectory
 /etc/qubes-rpc/qubes.GetImageRGBA
-/etc/sudoers.d/qubes
+%config(noreplace) /etc/sudoers.d/qubes
 %config(noreplace) /etc/sysconfig/iptables
 %config(noreplace) /etc/sysconfig/ip6tables
 /etc/sysconfig/modules/qubes-core.modules
 /etc/sysconfig/modules/qubes-misc.modules
 %config(noreplace) /etc/tinyproxy/filter-qubes-yum
 %config(noreplace) /etc/tinyproxy/tinyproxy-qubes-yum.conf
-/etc/udev/rules.d/50-qubes-misc.rules
-/etc/udev/rules.d/99-qubes-network.rules
+%config(noreplace) /etc/udev/rules.d/50-qubes-misc.rules
+%config(noreplace) /etc/udev/rules.d/99-qubes-network.rules
 /etc/xdg/autostart/00-qubes-show-hide-nm-applet.desktop
 /etc/xdg/nautilus-actions/nautilus-actions.conf
 /etc/xen/scripts/vif-route-qubes