summaryrefslogtreecommitdiff
path: root/libre-testing/systemd/initcpio-install-systemd
diff options
context:
space:
mode:
authorbill-auger <mr.j.spam.me@gmail.com>2021-02-21 21:54:20 -0500
committerbill-auger <mr.j.spam.me@gmail.com>2021-02-25 00:00:41 -0500
commit631fef79feb0063d1e8000cc17746f1725084a91 (patch)
tree88287075138c65b03300d3fe135310ed34c74652 /libre-testing/systemd/initcpio-install-systemd
parent7650fab4b2f279f32161418f661cffa78913e40a (diff)
downloadabslibre-631fef79feb0063d1e8000cc17746f1725084a91.tar.gz
abslibre-631fef79feb0063d1e8000cc17746f1725084a91.tar.bz2
abslibre-631fef79feb0063d1e8000cc17746f1725084a91.zip
[arm/libre-testing/systemd]: v247.3
Diffstat (limited to 'libre-testing/systemd/initcpio-install-systemd')
-rw-r--r--libre-testing/systemd/initcpio-install-systemd33
1 files changed, 14 insertions, 19 deletions
diff --git a/libre-testing/systemd/initcpio-install-systemd b/libre-testing/systemd/initcpio-install-systemd
index 8fb4441f7..18846528c 100644
--- a/libre-testing/systemd/initcpio-install-systemd
+++ b/libre-testing/systemd/initcpio-install-systemd
@@ -69,10 +69,13 @@ add_systemd_unit() {
map add_systemd_unit "${values[@]}"
;;
Exec*)
- # don't add binaries unless they are required
- if [[ ${values[0]:0:1} != '-' ]]; then
- add_binary "${values[0]}"
- fi
+ # do not add binaries unless they are required,
+ # strip special executable prefixes
+ case ${values[0]} in
+ -*) ;;
+ !!*) add_binary "${values[0]#!!}" ;;
+ *) add_binary "${values[0]#[@!:+]}" ;;
+ esac
;;
esac
@@ -103,13 +106,14 @@ add_systemd_drop_in() {
build() {
local rules unit
- # from base
- add_binary /bin/mount
add_binary /usr/bin/kmod /usr/bin/modprobe
- add_binary /usr/lib/systemd/systemd /init
+ add_binary /usr/bin/mount
add_binary /usr/bin/sulogin
+ add_binary /usr/bin/umount
+ add_binary /usr/lib/systemd/systemd /init
map add_binary \
+ /usr/bin/journalctl \
/usr/bin/systemd-tmpfiles \
/usr/lib/systemd/systemd-hibernate-resume \
/usr/lib/systemd/systemd-shutdown \
@@ -118,9 +122,6 @@ build() {
/usr/lib/systemd/system-generators/systemd-gpt-auto-generator \
/usr/lib/systemd/system-generators/systemd-hibernate-resume-generator
- # for journalctl in emergency shell
- add_binary journalctl
-
# udev rules and systemd units
map add_udev_rule "$rules" \
50-udev-default.rules \
@@ -171,15 +172,9 @@ build() {
'group: files' \
'shadow: files'
- echo "root:x:0:0:root:/:/bin/sh" >"$BUILDROOT/etc/passwd"
- echo "root:x:0:root" >"$BUILDROOT/etc/group"
- echo "root::::::::" >"$BUILDROOT/etc/shadow"
-
- add_systemd_drop_in systemd-udevd.service resolve-names <<EOF
-[Service]
-ExecStart=
-ExecStart=/usr/lib/systemd/systemd-udevd --resolve-names=never
-EOF
+ echo "root:x:0:0:root:/root:/bin/sh" >"$BUILDROOT/etc/passwd"
+ echo 'root:*:::::::' >"$BUILDROOT/etc/shadow"
+ getent group root audio disk input kmem kvm lp optical render storage tty uucp video | awk -F: ' { print $1 ":x:" $3 ":" }' >"$BUILDROOT/etc/group"
add_dir "/etc/modules-load.d"
(