root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

[util-iso-image] check of initsys var instead of openrc binary

Browse source
This commit is contained in:
udeved 2015-02-09 00:23:30 +01:00
parent fb4813c7cd
commit 979969b33c
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/util-iso-image.sh
View file

@ -23,7 +23,8 @@ configure_user(){
# $1: chroot # $1: chroot
configure_hostname(){ configure_hostname(){
msg2 "Setting hostname: ${hostname} ..." msg2 "Setting hostname: ${hostname} ..."
if [[ -f $1/usr/bin/openrc ]];then # if [[ -f $1/usr/bin/openrc ]];then
if [[ ${initsys} == 'openrc' ]];then
local _hostname='hostname="'${hostname}'"' local _hostname='hostname="'${hostname}'"'
sed -i -e "s|^.*hostname=.*|${_hostname}|" $1/etc/conf.d/hostname sed -i -e "s|^.*hostname=.*|${_hostname}|" $1/etc/conf.d/hostname
else else
@ -33,14 +34,16 @@ configure_hostname(){
# $1: chroot # $1: chroot
configure_plymouth(){ configure_plymouth(){
if [ -e $1/etc/plymouth/plymouthd.conf ] ; then # if [ -e $1/etc/plymouth/plymouthd.conf ] ; then
if $(is_plymouth);then
msg2 "Setting plymouth $plymouth_theme ...." msg2 "Setting plymouth $plymouth_theme ...."
sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" $1/etc/plymouth/plymouthd.conf sed -i -e "s/^.*Theme=.*/Theme=$plymouth_theme/" $1/etc/plymouth/plymouthd.conf
fi fi
} }
configure_services_live(){ configure_services_live(){
if [[ -f ${work_dir}/root-image/usr/bin/openrc ]];then # if [[ -f ${work_dir}/root-image/usr/bin/openrc ]];then
if [[ ${initsys} == 'openrc' ]];then
msg2 "Congiguring OpenRC ...." msg2 "Congiguring OpenRC ...."
for svc in ${start_openrc_live[@]}; do for svc in ${start_openrc_live[@]}; do
if [[ -f $1/etc/init.d/$svc ]]; then if [[ -f $1/etc/init.d/$svc ]]; then
@ -59,7 +62,8 @@ configure_services_live(){
} }
configure_services(){ configure_services(){
if [[ -f ${work_dir}/root-image/usr/bin/openrc ]];then # if [[ -f ${work_dir}/root-image/usr/bin/openrc ]];then
if [[ ${initsys} == 'openrc' ]];then
msg2 "Congiguring OpenRC ...." msg2 "Congiguring OpenRC ...."
for svc in ${start_openrc[@]}; do for svc in ${start_openrc[@]}; do
if [[ -f $1/etc/init.d/$svc ]]; then if [[ -f $1/etc/init.d/$svc ]]; then