remove service config for livecd
This commit is contained in:
parent
c82f4d8e20
commit
e5bbddeb57
5 changed files with 3 additions and 40 deletions
|
@ -87,9 +87,7 @@ make_overlay() {
|
||||||
copy_livecd_init "${work_dir}/overlay"
|
copy_livecd_init "${work_dir}/overlay"
|
||||||
|
|
||||||
#wget -O ${work_dir}/overlay/etc/pacman.d/mirrorlist http://git.manjaro.org/packages-sources/basis/blobs/raw/master/pacman-mirrorlist/mirrorlist
|
#wget -O ${work_dir}/overlay/etc/pacman.d/mirrorlist http://git.manjaro.org/packages-sources/basis/blobs/raw/master/pacman-mirrorlist/mirrorlist
|
||||||
|
|
||||||
${auto_svc_conf} && configure_services_livecd "${work_dir}/overlay"
|
|
||||||
|
|
||||||
# copy over manjaro-tools.conf
|
# copy over manjaro-tools.conf
|
||||||
copy_manjaro_tools_conf "${work_dir}/overlay/opt/livecd"
|
copy_manjaro_tools_conf "${work_dir}/overlay/opt/livecd"
|
||||||
|
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
# Maintainer: artoo <flower_of_life@gmx.net>
|
# Maintainer: artoo <flower_of_life@gmx.net>
|
||||||
|
|
||||||
pkgname=manjaro-tools-git
|
pkgname=manjaro-tools-git
|
||||||
pkgver=r256.3f3291c
|
pkgver=r264.c82f4d8
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='Development tools for Manjaro Linux'
|
pkgdesc='Development tools for Manjaro Linux'
|
||||||
arch=('any')
|
arch=('any')
|
||||||
|
|
|
@ -92,6 +92,3 @@
|
||||||
# unset defaults to given values,
|
# unset defaults to given values,
|
||||||
# names must match openrc service names
|
# names must match openrc service names
|
||||||
# startservices_openrc=('cupsd' 'fcron' 'metalog' 'cronie' 'bluetooth' 'connman' 'networkmanager')
|
# startservices_openrc=('cupsd' 'fcron' 'metalog' 'cronie' 'bluetooth' 'connman' 'networkmanager')
|
||||||
|
|
||||||
# unset defaults to given values
|
|
||||||
# startservices_livecd=('mhwd' 'livecd' 'pacman-init' 'pacman-boot')
|
|
||||||
|
|
|
@ -139,32 +139,6 @@ configure_services(){
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_services_livecd(){
|
|
||||||
if [[ -f ${work_dir}/root-image/usr/bin/openrc ]];then
|
|
||||||
msg2 "Congiguring OpenRC ...."
|
|
||||||
for svc in ${startservices_livecd[@]}; do
|
|
||||||
if [[ -f $1/etc/init.d/$svc ]]; then
|
|
||||||
msg2 "Setting $svc ..."
|
|
||||||
[[ ! -d $1/etc/runlevels/default ]] && mkdir -p $1/etc/runlevels/default
|
|
||||||
ln -sf /etc/init.d/$svc $1/etc/runlevels/default/$svc
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
else
|
|
||||||
msg2 "Congiguring SystemD ...."
|
|
||||||
for svc in ${startservices_livecd[@]}; do
|
|
||||||
[[ ! -d $1/etc/systemd/system/multi-user.target.wants ]] && mkdir -p $1/etc/systemd/system/multi-user.target.wants
|
|
||||||
if [[ -f $1/etc/systemd/system/$svc ]];then
|
|
||||||
msg2 "Setting $svc ..."
|
|
||||||
ln -sf /etc/systemd/system/$svc $1/etc/systemd/system/multi-user.target.wants/$svc
|
|
||||||
fi
|
|
||||||
if [[ -f $1/usr/lib/systemd/system/$svc ]];then
|
|
||||||
msg2 "Setting $svc ..."
|
|
||||||
ln -sf /usr/lib/systemd/system/$svc $1/etc/systemd/system/multi-user.target.wants/$svc
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
fi
|
|
||||||
}
|
|
||||||
|
|
||||||
# $1: chroot
|
# $1: chroot
|
||||||
configue_displaymanager(){
|
configue_displaymanager(){
|
||||||
local _dm
|
local _dm
|
||||||
|
|
|
@ -333,7 +333,7 @@ load_config(){
|
||||||
if [[ -n ${startservices_systemd} ]];then
|
if [[ -n ${startservices_systemd} ]];then
|
||||||
startservices_systemd=${startservices_systemd}
|
startservices_systemd=${startservices_systemd}
|
||||||
else
|
else
|
||||||
startservices_systemd=('cronie' 'bluez' 'NetworkManager' 'ModemManager')
|
startservices_systemd=('cronie' 'bluez' 'tlp' 'tlp-sleep' 'NetworkManager' 'ModemManager' 'cupsd')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n ${startservices_openrc} ]];then
|
if [[ -n ${startservices_openrc} ]];then
|
||||||
|
@ -342,12 +342,6 @@ load_config(){
|
||||||
startservices_openrc=('cupsd' 'fcron' 'metalog' 'cronie' 'bluetooth' 'connman' 'networkmanager')
|
startservices_openrc=('cupsd' 'fcron' 'metalog' 'cronie' 'bluetooth' 'connman' 'networkmanager')
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ -n ${startservices_livecd} ]];then
|
|
||||||
startservices_livecd=${startservices_livecd}
|
|
||||||
else
|
|
||||||
startservices_livecd=('mhwd' 'livecd' 'pacman-init' 'pacman-boot')
|
|
||||||
fi
|
|
||||||
|
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue