util-iso-yaml: add optional libpwquality check in user module

util-iso: check for $log_dir

bin/buildiso.in

@@ -44,6 +44,7 @@ prepare_build(){
     mnt_dir=${chroots_iso}/${profile}/mnt
     prepare_dir "${mnt_dir}"
     prepare_dir "${iso_dir}"
+    prepare_dir "${iso_root}"
 }
 
 show_profile(){

lib/util-iso-grub.sh

@@ -46,10 +46,10 @@ prepare_initramfs(){
 prepare_boot_extras(){
     local src="$1" dest="$2"
 
-#     for u in intel amd;do
+    for u in intel amd;do
-#         cp $src/boot/$u-ucode.img $dest/$u-ucode.img
+        cp $src/boot/$u-ucode.img $dest/$u-ucode.img
-#         cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
+        cp $src/usr/share/licenses/$u-ucode/LICENSE $dest/$u-ucode.LICENSE
-#     done
+    done
 
     cp $src/boot/memtest86+/memtest.bin $dest/memtest
     cp $src/usr/share/licenses/common/GPL2/license.txt $dest/memtest.COPYING

lib/util-iso-yaml.sh

@@ -25,7 +25,13 @@ write_users_conf(){
     echo "setRootPassword: true" >> "$conf"
 #     echo "doReusePassword: false" >> "$conf" # only used in old 'users' module
     echo "availableShells: /bin/bash, /bin/zsh" >> "$conf" # only used in new 'users' module
-    echo "avatarFilePath:  ~/.face" >> "$conf"
+#     echo "avatarFilePath:  ~/.face" >> "$conf"
+#     echo "passwordRequirements:" >> "$conf"
+#     echo "    minLength: -1" >> "$conf"
+#     echo "    maxLength: -1" >> "$conf"
+#     echo "    libpwquality:" >> "$conf"
+#     echo "        - minlen=8" >> "$conf"
+#     echo "        - minclass=80" >> "$conf"
 }
 
 write_servicescfg_conf(){
@@ -65,16 +71,10 @@ write_postcfg_conf(){
     sed -e "s|openrc|$init|" -i "$conf"
 }
 
-write_netinstall_conf(){
-    local conf="$1/netinstall.conf" init="$2"
-    sed -e "s|netgroups-openrc.yaml|netgroups-$init.yaml|" -i "$conf"
-}
-
 configure_calamares(){
     local mods="$1/etc/calamares/modules" init="$2"
     if [[ -d "$mods" ]];then
         info "Configuring [Calamares]"
-        write_netinstall_conf "$mods" "$init"
         write_users_conf "$mods"
         write_servicescfg_conf "$mods" "$init"
         write_postcfg_conf "$mods" "$init"

lib/util-iso.sh

@@ -87,6 +87,7 @@ error_function() {
 # $1: function
 run_log(){
     local func="$1" log_dir='/var/log/artools'
+    [[ ! -d $log_dir ]] && mkdir -p $log_dir
     local logfile=${log_dir}/$(gen_iso_fn).$func.log
     logpipe=$(mktemp -u "/tmp/$func.pipe.XXXXXXXX")
     mkfifo "$logpipe"

lib/util-pkg-subrepo.sh

@@ -10,21 +10,21 @@
 # GNU General Public License for more details.
 
 subrepo_init(){
-    local pkg="$1"
+    local pkg="$1" branch=master org=packages
-    git subrepo init $pkg -r gitea@${git_domain}:packages/$pkg.git -b master
+    git subrepo init "$pkg" -r gitea@"${git_domain}":"$org"/"$pkg".git -b "$branch"
 }
 
 subrepo_push(){
-    local pkg="$1"
+    local pkg="$1" branch=master
-    git subrepo push -u "$pkg" -b master
+    git subrepo push "$pkg" -u -b "$branch"
 }
 
 subrepo_pull(){
-    local pkg="$1" name="${2:-$1}"
+    local pkg="$1" name="${2:-$1}" branch=master org=packages
-    git subrepo pull "$pkg" -b master -r gitea@${git_domain}:packages/$name.git -u
+    git subrepo pull "$pkg" -r gitea@"${git_domain}":"$org"/"$name".git -u -b "$branch"
 }
 
 subrepo_clone(){
-    local pkg="$1" name="${2:-$1}"
+    local pkg="$1" name="${2:-$1}" branch=master org=packages
-    git subrepo clone gitea@gitea.artixlinux.org:packages/$pkg.git "$name" -b master
+    git subrepo clone gitea@"${git_domain}":"$org"/"$name".git "$pkg" -b "$branch"
 }