1 files changed, 25 insertions, 14 deletions

diff --git a/abs/core/systemd/initcpio-install-systemd b/abs/core/systemd/initcpio-install-systemd
index 2c59074..96df98a 100644
--- a/abs/core/systemd/initcpio-install-systemd
+++ b/abs/core/systemd/initcpio-install-systemd
@@ -4,7 +4,7 @@ strip_quotes() {
   local len=${#1} quotes=$'[\'"]' str=${!1}
 
   if [[ ${str:0:1} = ${str: -1} && ${str:0:1} = $quotes ]]; then
-    declare -g "$1=${str:1:-1}"
+    printf -v "$1" %s "${str:1:-1}"
   fi
 }
 
@@ -34,6 +34,7 @@ add_udev_rule() {
                     strip_quotes 'value'
                     # just take the first word as the binary name
                     binary=${value%% *}
+                    [[ ${binary:0:1} == '$' ]] && continue
                     if [[ ${binary:0:1} != '/' ]]; then
                         binary=$(PATH=/usr/lib/udev:/lib/udev type -P "$binary")
                     fi
@@ -98,13 +99,16 @@ build() {
     # from base
     add_binary /bin/mount
     add_binary /usr/bin/kmod /usr/bin/modprobe
-
-    # systemd
     add_binary /usr/lib/systemd/systemd /init
-    add_binary /usr/bin/systemd-tmpfiles
 
-    # generate sysroot.mount and sysroot-usr.mount
-    add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator"
+    map add_binary \
+        /usr/bin/systemd-tmpfiles \
+        /usr/lib/systemd/systemd-hibernate-resume \
+        /usr/lib/systemd/system-generators/systemd-fstab-generator \
+        /usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
+        /usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
+
+    add_module "kdbus?"
 
     # udev rules and systemd units
     map add_udev_rule "$rules" \
@@ -112,10 +116,9 @@ build() {
             60-persistent-storage.rules \
             64-btrfs.rules \
             80-drivers.rules \
-            99-systemd.rules \
+            99-systemd.rules
 
     map add_systemd_unit \
-            ctrl-alt-del.target \
             initrd-cleanup.service \
             initrd-fs.target \
             initrd-parse-etc.service \
@@ -125,24 +128,32 @@ build() {
             initrd-udevadm-cleanup-db.service \
             initrd.target \
             kmod-static-nodes.service \
+            local-fs.target \
+            local-fs-pre.target \
+            paths.target \
+            reboot.target \
+            slices.target \
             sockets.target \
+            swap.target \
             systemd-fsck@.service \
+            systemd-hibernate-resume@.service \
             systemd-journald.service \
+            systemd-journald-audit.socket \
+            systemd-journald-dev-log.socket \
             systemd-tmpfiles-setup-dev.service \
             systemd-udev-trigger.service \
             systemd-udevd-control.socket \
             systemd-udevd-kernel.socket \
-            systemd-udevd.service
+            systemd-udevd.service \
+            timers.target
 
     add_symlink "/usr/lib/systemd/system/default.target" "initrd.target"
+    add_symlink "/usr/lib/systemd/system/ctrl-alt-del.target" "reboot.target"
 
-    # libdbus needs the passwd info of the root user
-    # TODO: make sure this is no longer necessary when systemctl moves to sd-bus
+    # udev wants /etc/group since it doesn't launch with --resolve-names=never
     add_file "/etc/nsswitch.conf"
-    add_file "/etc/passwd"
     add_binary "$(readlink -f /usr/lib/libnss_files.so)"
-
-    # udev wants /etc/group since it doesn't launch with --resolve-names=never
+    add_file "/etc/passwd"
     add_file "/etc/group"
 }