summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Cady <d@jerkface.net>2017-03-28 16:02:26 -0400
committerAndrew Cady <d@jerkface.net>2017-03-28 16:03:10 -0400
commit2a575328ac1432c21e0b983d2432f1f64dff0f96 (patch)
tree82a94eb0715abee9791c2e47a5de25a9f21cbcde
parentdb22b9daf53beece1ea94006155079a1653deec4 (diff)
change some log locations
-rw-r--r--initramfs-tools/scripts/samizdat5
-rw-r--r--src/initrd/btrfs-create.sh3
2 files changed, 5 insertions, 3 deletions
diff --git a/initramfs-tools/scripts/samizdat b/initramfs-tools/scripts/samizdat
index 4522a51..515b724 100644
--- a/initramfs-tools/scripts/samizdat
+++ b/initramfs-tools/scripts/samizdat
@@ -72,9 +72,10 @@ samizdat_install_udev_rules()
72 72
73samizdat_restart_udev() 73samizdat_restart_udev()
74{ 74{
75 mkdir -p /var/log 75 local LOG_DIR=/run/initramfs/samizdat/log
76 mkdir -p "$LOG_DIR"
76 killall systemd-udevd 2>/dev/null 77 killall systemd-udevd 2>/dev/null
77 /lib/systemd/systemd-udevd --resolve-names=never --debug >/var/log/udevd-systemd.log 2>&1 & 78 /lib/systemd/systemd-udevd --resolve-names=never --debug >$LOG_DIR/udevd-systemd.log 2>&1 &
78 udevadm hwdb --update # rule is not executed by 'udevadm trigger' otherwise. not sure why 79 udevadm hwdb --update # rule is not executed by 'udevadm trigger' otherwise. not sure why
79} 80}
80 81
diff --git a/src/initrd/btrfs-create.sh b/src/initrd/btrfs-create.sh
index 917f957..a1a53ed 100644
--- a/src/initrd/btrfs-create.sh
+++ b/src/initrd/btrfs-create.sh
@@ -327,7 +327,8 @@ init_gpg()
327 bootdone samizdat-gpg 327 bootdone samizdat-gpg
328 fi 328 fi
329 329
330 if samizdat-password-agent >/var/log/samizdat-password-agent.log 2>&1; then 330 local LOG_DIR=/run/initramfs/samizdat/log
331 if samizdat-password-agent > "$LOG_DIR"/samizdat-password-agent.log 2>&1; then
331 clear 332 clear
332 true 333 true
333 else 334 else