[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2020-11-29 Thread Christian Hesse via arch-commits 
Date: Sunday, November 29, 2020 @ 13:22:07
  Author: eworm
Revision: 402397

add umount binary in initramfs (FS#63749)

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2020-11-29 13:02:53 UTC (rev 402396)
+++ initcpio-install-systemd2020-11-29 13:22:07 UTC (rev 402397)
@@ -106,11 +106,11 @@
 build() {
 local rules unit
 
-# from base
-add_binary /bin/mount
 add_binary /usr/bin/kmod /usr/bin/modprobe
+add_binary /usr/bin/mount
+add_binary /usr/bin/sulogin
+add_binary /usr/bin/umount
 add_binary /usr/lib/systemd/systemd /init
-add_binary /usr/bin/sulogin
 
 map add_binary \
 /usr/bin/journalctl \

[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2017-10-11 Thread Dave Reisner 
Date: Wednesday, October 11, 2017 @ 12:07:20
  Author: dreisner
Revision: 307502

Expand MODULES as an array (FS#55926)

This covers both the case of MODULES being a string and an array in
/etc/mkinitcpio.conf.

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2017-10-11 11:17:49 UTC (rev 307501)
+++ initcpio-install-systemd2017-10-11 12:07:20 UTC (rev 307502)
@@ -181,7 +181,7 @@
 (
   . "$_f_config"
   set -f
-  printf "%s\n" $MODULES >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
+  printf '%s\n' ${MODULES[@]} >"$BUILDROOT/etc/modules-load.d/MODULES.conf"
 )
 }

[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2016-05-28 Thread Dave Reisner 
Date: Saturday, May 28, 2016 @ 15:06:00
  Author: dreisner
Revision: 268713

drop kdbus module addition now that its dead

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |2 --
 1 file changed, 2 deletions(-)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2016-05-28 08:47:35 UTC (rev 268712)
+++ initcpio-install-systemd2016-05-28 13:06:00 UTC (rev 268713)
@@ -108,8 +108,6 @@
 /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" \
 50-udev-default.rules \

[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2015-03-15 Thread Dave Reisner 
Date: Sunday, March 15, 2015 @ 15:05:50
  Author: dreisner
Revision: 233872

include reboot.target (FS#44191)

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |1 +
 1 file changed, 1 insertion(+)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2015-03-15 13:34:19 UTC (rev 233871)
+++ initcpio-install-systemd2015-03-15 14:05:50 UTC (rev 233872)
@@ -131,6 +131,7 @@
 local-fs.target \
 local-fs-pre.target \
 paths.target \
+reboot.target \
 slices.target \
 sockets.target \
 swap.target \

[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2014-04-04 Thread Dave Reisner 
Date: Saturday, April 5, 2014 @ 06:58:15
  Author: dreisner
Revision: 209820

include gpt auto generator (FS#39569)

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2014-04-04 19:11:46 UTC (rev 209819)
+++ initcpio-install-systemd2014-04-05 04:58:15 UTC (rev 209820)
@@ -103,8 +103,9 @@
 add_binary /usr/lib/systemd/systemd /init
 add_binary /usr/bin/systemd-tmpfiles
 
-# generate sysroot.mount and sysroot-usr.mount
+# generators
 add_file /usr/lib/systemd/system-generators/systemd-fstab-generator
+add_file /usr/lib/systemd/system-generators/systemd-gpt-auto-generator
 
 # udev rules and systemd units
 map add_udev_rule $rules \

[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2013-09-19 Thread Dave Reisner 
Date: Thursday, September 19, 2013 @ 15:49:42
  Author: dreisner
Revision: 194597

add tmpfiles binary and early /dev setup services

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |   17 ++---
 1 file changed, 10 insertions(+), 7 deletions(-)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2013-09-19 09:44:46 UTC (rev 194596)
+++ initcpio-install-systemd2013-09-19 13:49:42 UTC (rev 194597)
@@ -101,6 +101,7 @@
 
 # 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
@@ -114,12 +115,7 @@
 99-systemd.rules \
 
 map add_systemd_unit \
-systemd-udevd-control.socket \
-systemd-udevd-kernel.socket \
-sockets.target \
-systemd-journald.service \
-systemd-udevd.service \
-systemd-udev-trigger.service \
+ctrl-alt-del.target
 initrd-cleanup.service \
 initrd-fs.target \
 initrd-parse-etc.service \
@@ -128,8 +124,15 @@
 initrd-switch-root.target \
 initrd-udevadm-cleanup-db.service \
 initrd.target \
+kmod-static-nodes.service \
+sockets.target \
 systemd-fsck@.service \
-ctrl-alt-del.target
+systemd-journald.service \
+systemd-tmpfiles-setup-dev.service \
+systemd-udev-trigger.service \
+systemd-udevd-control.socket \
+systemd-udevd-kernel.socket \
+systemd-udevd.service \
 
 add_symlink /usr/lib/systemd/system/default.target initrd.target

[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2013-07-23 Thread Dave Reisner 
Date: Tuesday, July 23, 2013 @ 14:59:56
  Author: dreisner
Revision: 191302

fix parsing of binaries from udev rules

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |   19 ++-
 1 file changed, 14 insertions(+), 5 deletions(-)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2013-07-23 12:44:57 UTC (rev 191301)
+++ initcpio-install-systemd2013-07-23 12:59:56 UTC (rev 191302)
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+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}
+  fi
+}
+
 add_udev_rule() {
 # Add an udev rules file to the initcpio image. Dependencies on binaries
 # will be discovered and added.
@@ -17,11 +25,12 @@
 
 while IFS=, read -ra rule; do
 for pair in ${rule[@]}; do
-IFS='=' read -r key value  $pair
-
+IFS=' =' read -r key value  $pair
+strip_quotes 'value'
 case $key in
 RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
-binary=${value[0]#\}
+# just take the first word as the binary name
+binary=${value%% *}
 if [[ ${binary:0:1} != '/' ]]; then
 binary=$(PATH=/usr/lib/udev:/lib/udev type -P 
$binary)
 fi
@@ -29,7 +38,7 @@
 ;;
 esac
 done
-done  $rules
+done $rules
 }
 
 add_systemd_unit() {
@@ -63,7 +72,7 @@
 ;;
 esac
 
-done  $unit
+done $unit
 
 # preserve reverse soft dependency
 for dep in {/usr,}/lib/systemd/system/*.wants/${unit##*/}; do

[arch-commits] Commit in systemd/trunk (initcpio-install-systemd)

2013-07-23 Thread Dave Reisner 
Date: Tuesday, July 23, 2013 @ 17:20:36
  Author: dreisner
Revision: 191322

cut processing time in half for udev rules

Modified:
  systemd/trunk/initcpio-install-systemd

--+
 initcpio-install-systemd |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

Modified: initcpio-install-systemd
===
--- initcpio-install-systemd2013-07-23 15:15:03 UTC (rev 191321)
+++ initcpio-install-systemd2013-07-23 15:20:36 UTC (rev 191322)
@@ -24,11 +24,14 @@
 add_file $rules
 
 while IFS=, read -ra rule; do
+# skip empty lines, comments
+[[ -z $rule || $rule = @(+([[:space:]])|#*) ]]  continue
+
 for pair in ${rule[@]}; do
 IFS=' =' read -r key value  $pair
-strip_quotes 'value'
 case $key in
 RUN@({program}|+)|IMPORT{program}|ENV{REMOVE_CMD})
+strip_quotes 'value'
 # just take the first word as the binary name
 binary=${value%% *}
 if [[ ${binary:0:1} != '/' ]]; then