QubesOS/qubes-linux-template-builder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rpm: fix post-installation script - call relevant parts as user

Browse Source 
... or add --force-root option
This commit is contained in:
Marek Marczykowski-Górecki 2015-05-17 00:01:09 +02:00
parent 93268b6548
commit 5091ccc023
1 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
templates.spec
View File

@ -95,27 +95,41 @@ export XDG_DATA_DIRS=/usr/share/
echo "--> Instaling menu shortcuts..." echo "--> Instaling menu shortcuts..."
ln -sf /usr/share/qubes/icons/template.png %{dest_dir}/icon.png ln -sf /usr/share/qubes/icons/template.png %{dest_dir}/icon.png
local_user=`getent group qubes | cut -d : -f 4 | cut -d , -f 1`
if [ -n "$local_user" ]; then
call_as_user() {
su -c "$*" - $local_user
}
else
# This will be the case during installation - user will be created in
# firstboot. There is also a code to fix file permissions, so not a big problem
call_as_user() {
$*
}
fi
if [ "$1" = 1 ] ; then if [ "$1" = 1 ] ; then
# installing for the first time # installing for the first time
qvm-add-template --rpm %{template_name} call_as_user qvm-add-template --rpm %{template_name}
fi fi
# If running inside of chroot (means - from anaconda), force offline mode # If running inside of chroot (means - from anaconda), force offline mode
if [ "`stat -c %d:%i /`" != "`stat -c %d:%i /proc/1/root/.`" ]; then if [ "`stat -c %d:%i /`" != "`stat -c %d:%i /proc/1/root/.`" ]; then
qvm-template-commit --offline-mode %{template_name} qvm-template-commit --offline-mode %{template_name}
call_as_user /usr/libexec/qubes-appmenus/create-apps-for-appvm.sh \
%{dest_dir}/apps.templates %{template_name} vm-templates
else else
qvm-template-commit %{template_name} qvm-template-commit %{template_name}
qvm-prefs -s %{template_name} netvm none qvm-prefs --force-root -s %{template_name} netvm none
qvm-start --no-guid %{template_name} qvm-start --no-guid %{template_name}
qvm-sync-appmenus --force-root %{template_name} call_as_user qvm-sync-appmenus --force-root %{template_name}
qvm-shutdown --wait %{template_name} qvm-shutdown --wait %{template_name}
qvm-prefs -s %{template_name} netvm default qvm-prefs --force-root -s %{template_name} netvm default
# restore default firewall settings, which was reset by setting netvm=none # restore default firewall settings, which was reset by setting netvm=none
rm -f %{dest_dir}/firewall.xml rm -f %{dest_dir}/firewall.xml
chgrp -R qubes %{dest_dir} chgrp -R qubes %{dest_dir}
chmod g+rwX -R %{dest_dir} chmod g+rwX -R %{dest_dir}
fi fi
/usr/libexec/qubes-appmenus/create-apps-for-appvm.sh %{dest_dir}/apps.templates %{template_name} vm-templates
exit 0 exit 0
%preun %preun