Change defaults

Fixes #151
picodotdev · Dec 20, 2021 · 9f5a239 · 9f5a239
1 parent 2e25307
commit 9f5a239
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/alis.conf b/alis.conf
@@ -108,7 +108,7 @@ ADDITIONAL_USERS=() # eg. ("user1=password1" "user2=password2")
 ## systemd-homed
 ### SYSTEMD_HOMED "true" value requires interactivity to set user password
 SYSTEMD_HOMED="false"
-SYSTEMD_HOMED_STORAGE="auto !luks !subvolume !directory !fscrypt !cifs"
+SYSTEMD_HOMED_STORAGE="!auto !luks !subvolume directory !fscrypt !cifs"
 SYSTEMD_HOMED_STORAGE_LUKS=(["type"]="auto !ext4 !btrfs !xfs")
 SYSTEMD_HOMED_STORAGE_CIFS=(["domain"]="" ["service"]="")
 

diff --git a/alis.sh b/alis.sh
@@ -1205,7 +1205,7 @@ function create_user_homectl() {
     USER=$1
     PASSWORD=$2
     USERS_GROUPS=$3
-    STORAGE=""
+    STORAGE="--storage=directory"
     IMAGE_PATH="--image-path=/mnt/home/"
     FS_TYPE=""
     CIFS_DOMAIN=""
@@ -1233,9 +1233,9 @@ function create_user_homectl() {
     fi
 
     systemctl start systemd-homed.service
-    sleep 5 # #151 avoid Operation on home <USER> failed: Transport endpoint is not conected.
+    sleep 10 # #151 avoid Operation on home <USER> failed: Transport endpoint is not conected.
     homectl create $USER --enforce-password-policy=no --timezone=$TZ --language=$L $STORAGE $IMAGE_PATH $FS_TYPE $CIFS_DOMAIN $CIFS_USERNAME $CIFS_SERVICE -G "$USERS_GROUPS"
-    sleep 5 # #151 avoid Operation on home <USER> failed: Transport endpoint is not conected.
+    sleep 10 # #151 avoid Operation on home <USER> failed: Transport endpoint is not conected.
     cp -a "/var/lib/systemd/home/." "/mnt/var/lib/systemd/home/"
 }
 

diff --git a/packer/alis-packer-efi-ext4-luks-lvm-systemd-systemdhomed.sh b/packer/alis-packer-efi-ext4-luks-lvm-systemd-systemdhomed.sh
@@ -5,16 +5,15 @@ sed -i "s/LOG=.*/LOG=\"false\"/" ./alis.conf
 sed -i "s#DEVICE=.*#DEVICE=\"/dev/sda\"#" ./alis.conf
 sed -i "s/FILE_SYSTEM_TYPE=.*/FILE_SYSTEM_TYPE=\"ext4\"/" ./alis.conf
 sed -i "s/LVM=.*/LVM=\"true\"/" ./alis.conf
-sed -i "s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\"archlinux\"/" ./alis.conf
-sed -i "s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\"archlinux\"/" ./alis.conf
+sed -i "s/LUKS_PASSWORD=.*/LUKS_PASSWORD=\"\"/" ./alis.conf
+sed -i "s/LUKS_PASSWORD_RETYPE=.*/LUKS_PASSWORD_RETYPE=\"\"/" ./alis.conf
 sed -i "s/ROOT_PASSWORD=.*/ROOT_PASSWORD=\"archlinux\"/" ./alis.conf
 sed -i "s/ROOT_PASSWORD_RETYPE=.*/ROOT_PASSWORD_RETYPE=\"archlinux\"/" ./alis.conf
 sed -i "s/USER_PASSWORD=.*/USER_PASSWORD=\"archlinux\"/" ./alis.conf
 sed -i "s/USER_PASSWORD_RETYPE=.*/USER_PASSWORD_RETYPE=\"archlinux\"/" ./alis.conf
 sed -i "s/SYSTEMD_HOMED=.*/SYSTEMD_HOMED=\"true\"/" ./alis.conf
+sed -i "s/SYSTEMD_HOMED_STORAGE=.*/SYSTEMD_HOMED_STORAGE=\"luks\"/" ./alis.conf
+sed -i "s/SYSTEMD_HOMED_STORAGE_LUKS=.*/SYSTEMD_HOMED_STORAGE_LUKS=([\"type\"]=\"ext4\")/" ./alis.conf
 sed -i "s/BOOTLOADER=.*/BOOTLOADER=\"systemd\"/" ./alis.conf
-sed -i "s/PACKAGES_FLATPAK_INSTALL=.*/PACKAGES_FLATPAK_INSTALL=\"true\"/" ./alis.conf
-sed -i "s/PACKAGES_SDKMAN_INSTALL=.*/PACKAGES_SDKMAN_INSTALL=\"true\"/" ./alis.conf
-sed -i "s/PACKAGES_FLATPAK_CUSTOM=.*/PACKAGES_FLATPAK_CUSTOM=\"org.videolan.VLC\"/" ./alis.conf
 sed -i "s/PACKAGES_SDKMAN_SDKS=.*/PACKAGES_SDKMAN_SDKS=\"java:17.0.1-tem\"/" ./alis.conf