core-dom0 should not add qubes.repo -- this is a task of qubes-release package and installer
This commit is contained in:
parent
0982943466
commit
0104e0eac0
@ -111,9 +111,6 @@ mkdir -p $RPM_BUILD_ROOT/var/lib/qubes/dvmdata
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/share/qubes/icons
|
||||
cp icons/*.png $RPM_BUILD_ROOT/usr/share/qubes/icons
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/etc/yum.repos.d
|
||||
cp ../dom0/qubes.repo $RPM_BUILD_ROOT/etc/yum.repos.d
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/usr/bin
|
||||
cp ../common/qubes_setup_dnat_to_ns $RPM_BUILD_ROOT/usr/lib/qubes
|
||||
cp ../common/qubes_fix_nm_conf.sh $RPM_BUILD_ROOT/usr/lib/qubes
|
||||
@ -145,11 +142,6 @@ echo '[keyfile]' >> /etc/NetworkManager/NetworkManager.conf
|
||||
fi
|
||||
/usr/lib/qubes/qubes_fix_nm_conf.sh
|
||||
|
||||
if [ -e /etc/yum.repos.d/qubes-r1-dom0.repo ]; then
|
||||
# we want the user to use the repo that comes with qubes-core-dom0 packages instead
|
||||
rm -f /etc/yum.repos.d/qubes-r1-dom0.repo
|
||||
fi
|
||||
|
||||
#if [ "$1" != 1 ] ; then
|
||||
## do this whole %post thing only when updating for the first time...
|
||||
#exit 0
|
||||
@ -299,7 +291,6 @@ fi
|
||||
%attr(770,root,qubes) %dir /var/lib/qubes/backup
|
||||
%attr(770,root,qubes) %dir /var/lib/qubes/dvmdata
|
||||
%dir /usr/share/qubes/icons/*.png
|
||||
/etc/yum.repos.d/qubes.repo
|
||||
/usr/lib/qubes/qubes_setup_dnat_to_ns
|
||||
/usr/lib/qubes/qubes_fix_nm_conf.sh
|
||||
/etc/dhclient.d/qubes_setup_dnat_to_ns.sh
|
||||
|
Loading…
Reference in New Issue
Block a user