root/nix-tools
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'devel' of github.com:manjaro/manjaro-tools into devel

Browse source
This commit is contained in:
Philip 2015-09-12 12:38:42 +02:00
commit c33db91b78
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -61,10 +61,22 @@ write_calamares_services_conf(){
echo ' - name: '"$s" >> "$conf" echo ' - name: '"$s" >> "$conf"
echo ' mandatory: false' >> "$conf" echo ' mandatory: false' >> "$conf"
echo '' >> "$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 done
echo 'targets:' >> "$conf" echo 'targets:' >> "$conf"
echo ' - name: "graphical"' >> "$conf" echo ' - name: "graphical"' >> "$conf"
echo ' mandatory: true' >> "$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 fi
} }

4
lib/util-iso.sh
View file

@ -288,6 +288,10 @@ make_image_livecd() {
configure_livecd_image "${path}" configure_livecd_image "${path}"
${is_custom_pac_conf} && clean_pacman_conf "${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}" umount_image "${path}"
# Clean up GnuPG keys # Clean up GnuPG keys