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

util-iso-image: simplify logind config

Browse source
This commit is contained in:
udeved 2017-03-21 21:44:03 +01:00
parent 7e3e0261b8
commit adcc42a14e
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -86,8 +86,7 @@ configure_lsb(){
configure_logind(){
msg2 "Configuring logind ..."
local conf=$1/etc/systemd/logind.conf
[[ ${initsys} == 'openrc' ]] && conf=$1/etc/elogind/logind.conf
local conf=$1/etc/$2/logind.conf
sed -i 's/#\(HandleSuspendKey=\)suspend/\1ignore/' "$conf"
sed -i 's/#\(HandleLidSwitch=\)suspend/\1ignore/' "$conf"
sed -i 's/#\(HandleHibernateKey=\)hibernate/\1ignore/' "$conf"
@ -156,9 +155,9 @@ configure_hosts(){
}
configure_system(){
configure_logind "$1"
case ${initsys} in
'systemd')
configure_logind "$1" "systemd"
configure_journald "$1"
# Prevent some services to be started in the livecd
@ -167,14 +166,14 @@ configure_system(){
msg2 "Disable systemd-gpt-auto-generator"
ln -sf /dev/null "${path}/usr/lib/systemd/system-generators/systemd-gpt-auto-generator"
echo ${hostname} > $1/etc/hostname
;;
'openrc')
local hn='hostname="'${hostname}'"'
sed -i -e "s|^.*hostname=.*|${hn}|" $1/etc/conf.d/hostname
configure_logind "$1" "elogind"
# local hn='hostname="'${hostname}'"'
# sed -i -e "s|^.*hostname=.*|${hn}|" $1/etc/conf.d/hostname
;;
esac
echo ${hostname} > $1/etc/hostname
}
configure_thus(){