Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel
This commit is contained in:
commit
c33db91b78
2 changed files with 16 additions and 0 deletions
|
@ -61,10 +61,22 @@ write_calamares_services_conf(){
|
|||
echo ' - name: '"$s" >> "$conf"
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
echo 'disable:' >> "$conf"
|
||||
for s in ${disable_openrc[@]};do
|
||||
echo ' - name: '"$s" >> "$conf"
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
done
|
||||
echo 'targets:' >> "$conf"
|
||||
echo ' - name: "graphical"' >> "$conf"
|
||||
echo ' mandatory: true' >> "$conf"
|
||||
echo 'disable:' >> "$conf"
|
||||
for s in ${disable_systemd[@]};do
|
||||
echo ' - name: '"$s" >> "$conf"
|
||||
echo ' mandatory: false' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
echo '' >> "$conf"
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -288,6 +288,10 @@ make_image_livecd() {
|
|||
configure_livecd_image "${path}"
|
||||
${is_custom_pac_conf} && clean_pacman_conf "${path}"
|
||||
|
||||
# Prevent some services to be started in the livecd
|
||||
echo 'File created by manjaro-tools. See systemd-update-done.service(8).' \
|
||||
| tee "${path}/etc/.updated" >"${path}/var/.updated"
|
||||
|
||||
umount_image "${path}"
|
||||
|
||||
# Clean up GnuPG keys
|
||||
|
|
Loading…
Reference in a new issue