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

util-iso-cal: fix openrc services; add mhwdcfg

Browse source 
util-iso: cosmetics with checksum msg
This commit is contained in:
udeved 2016-08-05 17:23:32 +02:00
parent 6c9b445aa2
commit 580464b9c1
2 changed files with 45 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -52,10 +52,10 @@ write_bootloader_conf(){
} }
write_services_conf(){ write_services_conf(){
local conf="$1/etc/calamares/modules/services.conf" if [[ ${initsys} == 'openrc' ]];then
local conf="$1/etc/calamares/modules/servicescfg.conf"
echo '---' > "$conf" echo '---' > "$conf"
echo '' >> "$conf" echo '' >> "$conf"
if [[ ${initsys} == 'openrc' ]];then
echo 'services:' >> "$conf" echo 'services:' >> "$conf"
echo ' enabled:' >> "$conf" echo ' enabled:' >> "$conf"
for s in ${enable_openrc[@]};do for s in ${enable_openrc[@]};do
@ -71,6 +71,9 @@ write_services_conf(){
done done
fi fi
else else
local conf="$1/etc/calamares/modules/services.conf"
echo '---' > "$conf"
echo '' >> "$conf"
echo 'services:' > "$conf" echo 'services:' > "$conf"
for s in ${enable_systemd[@]};do for s in ${enable_systemd[@]};do
echo ' - name: '"$s" >> "$conf" echo ' - name: '"$s" >> "$conf"
@ -210,7 +213,7 @@ write_settings_conf(){
echo " - initcpio" >> "$conf" echo " - initcpio" >> "$conf"
echo " - users" >> "$conf" echo " - users" >> "$conf"
echo " - displaymanager" >> "$conf" echo " - displaymanager" >> "$conf"
echo " - hardwarecfg" >> "$conf" echo " - mhwdcfg" >> "$conf"
echo " - networkcfg" >> "$conf" echo " - networkcfg" >> "$conf"
echo " - hwclock" >> "$conf" echo " - hwclock" >> "$conf"
if [[ ${initsys} == 'systemd' ]];then if [[ ${initsys} == 'systemd' ]];then
@ -232,6 +235,43 @@ write_settings_conf(){
echo "dont-chroot: false" >> "$conf" echo "dont-chroot: false" >> "$conf"
} }
write_mhwdcfg_conf(){
local conf="$1/etc/calamares/modules/mhwdcfg.conf"
echo "---" > "$conf"
echo "bus_types:" >> "$conf"
echo " - pci" >> "$conf"
echo " - usb" >> "$conf"
echo '' >> "$conf"
echo "identifiers:" >> "$conf"
echo " net:" >> "$conf"
echo " - '0200'" >> "$conf"
echo " - '0280'" >> "$conf"
echo " vid:" >> "$conf"
echo " - '0300'" >> "$conf"
echo '' >> "$conf"
if ${cal_netinstall};then
if ${cal_unpackfs};then
echo "local_repo: true" >> "$conf"
else
echo "local_repo: false" >> "$conf"
fi
else
echo "local_repo: true" >> "$conf"
fi
echo '' >> "$conf"
echo "repo_conf: /opt/live/pacman-gfx.conf" >> "$conf"
if ${cal_netinstall};then
if ${cal_unpackfs};then
echo "local_repo: true" >> "$conf"
else
echo "local_repo: false" >> "$conf"
fi
else
echo "local_repo: true" >> "$conf"
fi
}
write_chrootcfg_conf(){ write_chrootcfg_conf(){
local conf="$1/etc/calamares/modules/chrootcfg.conf" mode='"0o755"' local conf="$1/etc/calamares/modules/chrootcfg.conf" mode='"0o755"'
echo "---" > "$conf" echo "---" > "$conf"

2
lib/util-iso.sh
View file

@ -172,7 +172,7 @@ make_iso() {
make_checksum(){ make_checksum(){
msg "Creating [%s] sum ..." "${iso_checksum}" msg "Creating [%s] sum ..." "${iso_checksum}"
local cs=$(${iso_checksum}sum ${iso_dir}/$1) local cs=$(${iso_checksum}sum ${iso_dir}/$1)
msg2 "%s sum: %s" "${iso_checksum}" "${cs}" msg2 "%s sum: %s" "${iso_checksum}" "${cs##*/}"
echo "${cs}" > ${iso_dir}/$1.${iso_checksum} echo "${cs}" > ${iso_dir}/$1.${iso_checksum}
msg "Done [%s] sum" "${iso_checksum}" msg "Done [%s] sum" "${iso_checksum}"
} }