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

core-appvm.spec: create 'user' user in %pre instead of in %post

Browse Source 
... otherwsie rpm -i throws an error when trying to set permissions for
/home_volatile/user, as the user 'user' doesn't exist when the %files section
is being processed during rpm install (if this is a first install of the rpm).
This commit is contained in:
Joanna Rutkowska 2010-09-15 15:33:09 +02:00
parent 07967155d5
commit 1328cce87e
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpm_spec/core-appvm.spec
View File

@ -45,6 +45,13 @@ The Qubes core files for installation inside a Qubes AppVM.
%pre %pre
if [ "$1" != 1 ] ; then
# do this whole %pre thing only when updating for the first time...
exit 0
fi
adduser --create-home user
mkdir -p $RPM_BUILD_ROOT/var/lib/qubes mkdir -p $RPM_BUILD_ROOT/var/lib/qubes
if [ -e $RPM_BUILD_ROOT/etc/fstab ] ; then if [ -e $RPM_BUILD_ROOT/etc/fstab ] ; then
mv $RPM_BUILD_ROOT/etc/fstab $RPM_BUILD_ROOT/var/lib/qubes/fstab.orig mv $RPM_BUILD_ROOT/etc/fstab $RPM_BUILD_ROOT/var/lib/qubes/fstab.orig
@ -92,7 +99,6 @@ chown 500:500 $RPM_BUILD_ROOT/home_volatile/user
%triggerin -- initscripts %triggerin -- initscripts
cp /var/lib/qubes/serial.conf /etc/init/serial.conf cp /var/lib/qubes/serial.conf /etc/init/serial.conf
%post %post
if [ "$1" != 1 ] ; then if [ "$1" != 1 ] ; then
@ -101,7 +107,6 @@ exit 0
fi fi
usermod -L root usermod -L root
adduser --create-home user
usermod -L user usermod -L user
if ! [ -f /var/lib/qubes/serial.orig ] ; then if ! [ -f /var/lib/qubes/serial.orig ] ; then
cp /etc/init/serial.conf /var/lib/qubes/serial.orig cp /etc/init/serial.conf /var/lib/qubes/serial.orig