From 18c4f4a91d6796b94d0600add4fa3f2d776d92ca Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Thu, 30 Sep 2021 10:11:00 +0200
Subject: [PATCH] update installer and base

---
 .idea/vcs.xml                              |  1 +
 README.md                                  |  2 +-
 pkg/de-p1st-base/PKGBUILD                  | 10 +++++++---
 pkg/de-p1st-installer/PKGBUILD             |  2 +-
 pkg/de-p1st-installer/de-p1st-installer.sh |  6 ++++++
 pkg/de-p1st-systemd/README.md              |  6 +++---
 6 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index e266c5e..b4303cf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -36,6 +36,7 @@
     <mapping directory="$PROJECT_DIR$/pkg/lib32-ncurses5-compat-libs" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/pkg/libklvanc-git" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/pkg/libopenmpt-svn" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/pkg/librespeed-cli-bin" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/pkg/librist" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/pkg/libwacom-surface" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/pkg/lineageos-devel" vcs="Git" />
diff --git a/README.md b/README.md
index 6d6b272..ab7ba34 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ See [build-pkg/pkglist-AUR.txt](build-pkg/pkglist-AUR.txt) for a full list.
 They were added in the following manner:
 
 ```shell
-AUR_PKG=librespeed-cli-bin
+AUR_PKG=xml2
 git submodule add "https://aur.archlinux.org/${AUR_PKG}.git" pkg/"${AUR_PKG}"
 # echo "Add ${AUR_PKG} to 'build-pkg/pkglist-AUR.txt'. Each line represents one build stage."
 ```
diff --git a/pkg/de-p1st-base/PKGBUILD b/pkg/de-p1st-base/PKGBUILD
index f469d14..2cd5718 100644
--- a/pkg/de-p1st-base/PKGBUILD
+++ b/pkg/de-p1st-base/PKGBUILD
@@ -2,13 +2,14 @@
 _pkgname=base
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.8
+pkgver=0.1.9
 pkgrel=1
 pkgdesc="base packages for headless Arch installation on EFI system"
 arch=('any')
 url="https://codeberg.org/privacy1st/${_reponame}"
 license=('MIT')
 
+depends=()
 # Kernel + Headers
 depends=('de-p1st-kernel')
 # lz4 enabled mkinitcpio
@@ -25,6 +26,8 @@ depends+=('fuse-exfat' 'exfat-utils')
 depends+=('ntfs-3g')
 # bootmanager
 depends+=('de-p1st-grub' 'efibootmgr')
+# systemd with time synchronization and journal size limit
+depends+=('de-p1st-systemd')
 # pacman config
 depends+=('de-p1st-pacman')
 # makepkg config (part of pacman)
@@ -47,8 +50,9 @@ depends+=('de-p1st-htop')
 # fonts
 depends+=('de-p1st-font')
 
-# other
-# depends+=('usbutils')
 
+optdepends=()
 # terminal multiplexer
 optdepends+=('de-p1st-screen')
+# tools to query connected USB devices
+optdepends+=('usbutils')
diff --git a/pkg/de-p1st-installer/PKGBUILD b/pkg/de-p1st-installer/PKGBUILD
index 836a1da..675f1d4 100644
--- a/pkg/de-p1st-installer/PKGBUILD
+++ b/pkg/de-p1st-installer/PKGBUILD
@@ -2,7 +2,7 @@
 _pkgname=installer
 _reponame=arch
 pkgname="de-p1st-$_pkgname"
-pkgver=0.1.22
+pkgver=0.1.23
 pkgrel=1
 pkgdesc="Bash script to install Arch Linux"
 arch=('any')
diff --git a/pkg/de-p1st-installer/de-p1st-installer.sh b/pkg/de-p1st-installer/de-p1st-installer.sh
index 07f494b..97185c3 100755
--- a/pkg/de-p1st-installer/de-p1st-installer.sh
+++ b/pkg/de-p1st-installer/de-p1st-installer.sh
@@ -15,6 +15,7 @@ function main() {
   #   installation finished
 
   check_network  || return $?
+  system_time || return $?
   # in: BOOT_FIRMWARE, FS, HOSTNAME, USERNAME, USER_PWD, LUKS_PWD (all optional)
   # out: BOOT_FIRMWARE, FS, HOSTNAME, USERNAME, USER_PWD, LUKS_PWD
   get_user_input || return $?
@@ -77,6 +78,11 @@ function check_network() {
   }
 }
 
+function system_time() {
+  # Use timedatectl(1) to ensure the system clock is accurate
+  timedatectl set-ntp true
+}
+
 function increase_cow_space() {
   # May be useful when running 'pacman -Syu' on the live medium.
   # Usually not necessary!
diff --git a/pkg/de-p1st-systemd/README.md b/pkg/de-p1st-systemd/README.md
index f0c77bd..3ac3a85 100644
--- a/pkg/de-p1st-systemd/README.md
+++ b/pkg/de-p1st-systemd/README.md
@@ -1,8 +1,8 @@
 # systemd configuration
 
-* enable time synchronization
+* time synchronization
   * Archwiki: [systemd-timesyncd](https://wiki.archlinux.org/index.php/systemd-timesyncd)
+  * Archwiki: [System Time -> Time synchronization -> systemd-timesyncd](https://wiki.archlinux.org/title/System_time#Time_synchronization)
     
-* journal size lmit
+* journal size limit
   * Archwiki: [Systemd/Journal#Journal_size_limit](https://wiki.archlinux.org/index.php/Systemd/Journal#Journal_size_limit)
-