moritzruth/void-packages
1
0
Fork 0
Code Releases Activity Actions 2

xbps-src: add openrc_services trigger before system_users.

Browse source 
Packages that use both will try to remove the system user when the openrc services
are launched, so they report "user still logged in" errors.

While being here remove unnecessary empty lines in the generated scripts.
This commit is contained in:
Juan RP 2010-12-07 17:51:17 +01:00
parent dd98758983
commit 38a0a4eb53
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
xbps-src/shutils/metadata_scripts.sh
View file

@ -94,10 +94,17 @@ _EOF
if [ -n "${info_files}" ]; then if [ -n "${info_files}" ]; then
_add_trigger info-files _add_trigger info-files
echo "export info_files=\"${info_files}\"" >> $tmpf echo "export info_files=\"${info_files}\"" >> $tmpf
echo >> $tmpf
fi fi
fi fi
#
# Handle OpenRC services.
#
if [ -n "${openrc_services}" ]; then
_add_trigger openrc-service
echo "export openrc_services=\"${openrc_services}\"" >> $tmpf
fi
# #
# Handle system accounts. # Handle system accounts.
# #
@ -123,16 +130,6 @@ _EOF
fi fi
unset homedir shell descr groups unset homedir shell descr groups
done done
echo >> $tmpf
fi
#
# Handle OpenRC services.
#
if [ -n "${openrc_services}" ]; then
_add_trigger openrc-service
echo "export openrc_services=\"${openrc_services}\"" >> $tmpf
echo >> $tmpf
fi fi
# #
@ -141,7 +138,6 @@ _EOF
if [ -n "${register_shell}" ]; then if [ -n "${register_shell}" ]; then
_add_trigger register-shell _add_trigger register-shell
echo "export register_shell=\"${register_shell}\"" >> $tmpf echo "export register_shell=\"${register_shell}\"" >> $tmpf
echo >> $tmpf
fi fi
# #
@ -154,7 +150,6 @@ _EOF
fi fi
if [ -n "${sgml_entries}" ]; then if [ -n "${sgml_entries}" ]; then
echo "export sgml_entries=\"${sgml_entries}\"" >> $tmpf echo "export sgml_entries=\"${sgml_entries}\"" >> $tmpf
echo >> $tmpf
fi fi
if [ -n "${xml_catalogs}" ]; then if [ -n "${xml_catalogs}" ]; then
for catalog in ${xml_catalogs}; do for catalog in ${xml_catalogs}; do
@ -163,7 +158,6 @@ _EOF
fi fi
if [ -n "${xml_entries}" ]; then if [ -n "${xml_entries}" ]; then
echo "export xml_entries=\"${xml_entries}\"" >> $tmpf echo "export xml_entries=\"${xml_entries}\"" >> $tmpf
echo >> $tmpf
fi fi
if [ -n "${sgml_entries}" -o -n "${xml_entries}" ]; then if [ -n "${sgml_entries}" -o -n "${xml_entries}" ]; then
_add_trigger xml-catalog _add_trigger xml-catalog
@ -175,7 +169,6 @@ _EOF
if [ -n "${font_dirs}" ]; then if [ -n "${font_dirs}" ]; then
_add_trigger x11-fonts _add_trigger x11-fonts
echo "export font_dirs=\"${font_dirs}\"" >> $tmpf echo "export font_dirs=\"${font_dirs}\"" >> $tmpf
echo >> $tmpf
fi fi
# #
@ -185,7 +178,6 @@ _EOF
_add_trigger gtk-icon-cache _add_trigger gtk-icon-cache
echo "export gtk_iconcache_dirs=\"${gtk_iconcache_dirs}\"" \ echo "export gtk_iconcache_dirs=\"${gtk_iconcache_dirs}\"" \
>> $tmpf >> $tmpf
echo >> $tmpf
fi fi
# #
@ -209,12 +201,10 @@ _EOF
if [ -n "${gconf_entries}" ]; then if [ -n "${gconf_entries}" ]; then
echo "export gconf_entries=\"${gconf_entries}\"" \ echo "export gconf_entries=\"${gconf_entries}\"" \
>> $tmpf >> $tmpf
echo >> $tmpf
fi fi
if [ -n "${gconf_schemas}" ]; then if [ -n "${gconf_schemas}" ]; then
echo "export gconf_schemas=\"${gconf_schemas}\"" \ echo "export gconf_schemas=\"${gconf_schemas}\"" \
>> $tmpf >> $tmpf
echo >> $tmpf
fi fi
fi fi