Qubes/core-admin
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpm specs: %post cleanup

Browse Source 
Moved some stuff from the begging of %post sections after the
'if installing-for-the-first-time' check.
This commit is contained in:
Joanna Rutkowska 2010-06-14 23:52:21 +02:00
parent 333fee545a
commit ee7756b960
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpm_spec/core-appvm.spec
View File

@ -80,17 +80,17 @@ cp /etc/qubes_eventd_serial /etc/event.d/serial
%post %post
if [ "$1" != 1 ] ; then
# do this whole %post thing only when updating for the first time...
exit 0
fi
usermod -L root usermod -L root
usermod -L user usermod -L user
if ! [ -f /var/lib/qubes/serial.orig ] ; then if ! [ -f /var/lib/qubes/serial.orig ] ; then
cp /etc/event.d/serial /var/lib/qubes/serial.orig cp /etc/event.d/serial /var/lib/qubes/serial.orig
fi fi
if [ "$1" != 1 ] ; then
# do this whole %post thing only when updating for the first time...
exit 0
fi
echo "--> Disabling SELinux..." echo "--> Disabling SELinux..."
sed -e s/^SELINUX=.*$/SELINUX=disabled/ </etc/selinux/config >/etc/selinux/config.processed sed -e s/^SELINUX=.*$/SELINUX=disabled/ </etc/selinux/config >/etc/selinux/config.processed
mv /etc/selinux/config.processed /etc/selinux/config mv /etc/selinux/config.processed /etc/selinux/config

9
rpm_spec/core-dom0.spec
View File

@ -96,16 +96,13 @@ mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
cp init.d/iptables $RPM_BUILD_ROOT/etc/sysconfig cp init.d/iptables $RPM_BUILD_ROOT/etc/sysconfig
%post %post
chkconfig iptables on
chkconfig NetworkManager on
sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf
if [ "$1" != 1 ] ; then if [ "$1" != 1 ] ; then
# do this whole %post thing only when updating for the first time... # do this whole %post thing only when updating for the first time...
exit 0 exit 0
fi fi
#echo "Enabling essential services..." chkconfig iptables on
chkconfig NetworkManager on
chkconfig rsyslog on chkconfig rsyslog on
chkconfig haldaemon on chkconfig haldaemon on
chkconfig messagebus on chkconfig messagebus on
@ -113,6 +110,8 @@ chkconfig xenstored on
chkconfig xend on chkconfig xend on
chkconfig xenconsoled on chkconfig xenconsoled on
sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf
chkconfig --add qubes_core || echo "WARNING: Cannot add service qubes_core!" chkconfig --add qubes_core || echo "WARNING: Cannot add service qubes_core!"
chkconfig --add qubes_netvm || echo "WARNING: Cannot add service qubes_netvm!" chkconfig --add qubes_netvm || echo "WARNING: Cannot add service qubes_netvm!"

10
rpm_spec/core-netvm.spec
View File

@ -73,6 +73,11 @@ cp /etc/qubes_eventd_serial /etc/event.d/serial
%post %post
if [ "$1" != 1 ] ; then
# do this whole %post thing only when updating for the first time...
exit 0
fi
sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf sed 's/^net.ipv4.ip_forward.*/net.ipv4.ip_forward = 1/' -i /etc/sysctl.conf
usermod -L root usermod -L root
usermod -L user usermod -L user
@ -80,11 +85,6 @@ if ! [ -f /var/lib/qubes/serial.orig ] ; then
cp /etc/event.d/serial /var/lib/qubes/serial.orig cp /etc/event.d/serial /var/lib/qubes/serial.orig
fi fi
if [ "$1" != 1 ] ; then
# do this whole %post thing only when updating for the first time...
exit 0
fi
echo "--> Disabling SELinux..." echo "--> Disabling SELinux..."
sed -e s/^SELINUX=.*$/SELINUX=disabled/ </etc/selinux/config >/etc/selinux/config.processed sed -e s/^SELINUX=.*$/SELINUX=disabled/ </etc/selinux/config >/etc/selinux/config.processed
mv /etc/selinux/config.processed /etc/selinux/config mv /etc/selinux/config.processed /etc/selinux/config