-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA512 Hi,
on R3.2-rc1 antievilmaid is broken because tcsd doesn't start since it's user entry in /etc/passwd in the initramfs is missing. With the newer dracut version other modules also edit passwd and therefore the old way of installing it doesn't work anymore. See attachment for a patch. HW42 -----BEGIN PGP SIGNATURE----- iQIcBAEBCgAGBQJXdIQRAAoJEOSsySeKZGgWOoEP/0PTdugLfEnCK2a5vAgzp6Le 0MZawHI798sTNGHXhftPEv52nEeREvcLcQdH7yZh8Dl6HmM54xKr2tc27UAnds9L vj6jTNLxbYZPXkoORkIw2kFblxpOKtL9/j8LQ1EddOKpud43tqUpqqnSy0QU4ZRX Z+itHEabr9A3itd8SHM7zCW5sIy6uuk9nV9/S1gECNH8bvDSEb9WcyW23CdxQhqN BguHTvt6Uoj55RqWMyrBRP3RcOb/7okoJ+ZcQ5ke/itd9eVnOC/iqgTzHlCQDQSm 6ALcX331as7gmFdwaWCK41YGa0Dy8yzHd7QRi+q2DYNtcfRr0anMzNdG3JjwXm+O YYWtElxFuHd+PVyC7OJAy9QYQ4nTTvYAgOtl3COe1JdlyvsMLHGHMcPhD7zoZ8Yt 5Cz2prY4EhuMhqDikbzMK4oS+kPEordN5C5mAHGbSbE12XrJR4MFvaqnRKYRun1D Aj2a8mgGYm1ZKhrQhrewc04K5hCCU9GEOgVN9ENvYwrSDd0aom7om4b6rxoU9Huz 5see69Gv++fFuNfJOgMty3lnY9o99MPfVbF3koCaCU6eauH3jyFGifAKkkNKrji4 oWmxgGTC1Q28lVB0kbwfKek+1eH8TSbov/mJNooViyEGIDpYEeRUyocthvnG1DlL kuTmZUt8YHqrx2KVAUCc =wnbw -----END PGP SIGNATURE----- -- You received this message because you are subscribed to the Google Groups "qubes-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To post to this group, send email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/qubes-devel/a574d572-bd16-17ad-66ce-1e10a48469fc%40ipsumj.de. For more options, visit https://groups.google.com/d/optout.
From d7218e450ec07ccb58392cc9625b3134df38f729 Mon Sep 17 00:00:00 2001 From: HW42 <[email protected]> Date: Thu, 30 Jun 2016 04:12:34 +0200 Subject: [PATCH] dracut: fix /etc/{passwd,group,shadow} entries With the newer dracut version in R3.2 other modules also modify /etc/{passwd,group,shadow} and therefore the old method of installing them no longer works. Instead append the required entries to those files. --- anti-evil-maid/90anti-evil-maid/group | 1 - anti-evil-maid/90anti-evil-maid/module-setup.sh | 18 +++++++++++++++--- anti-evil-maid/90anti-evil-maid/passwd | 2 -- anti-evil-maid/90anti-evil-maid/shadow | 2 -- 4 files changed, 15 insertions(+), 8 deletions(-) delete mode 100644 anti-evil-maid/90anti-evil-maid/group delete mode 100644 anti-evil-maid/90anti-evil-maid/passwd delete mode 100644 anti-evil-maid/90anti-evil-maid/shadow diff --git a/anti-evil-maid/90anti-evil-maid/group b/anti-evil-maid/90anti-evil-maid/group deleted file mode 100644 index 8093be3..0000000 --- a/anti-evil-maid/90anti-evil-maid/group +++ /dev/null @@ -1 +0,0 @@ -tss:x:59: diff --git a/anti-evil-maid/90anti-evil-maid/module-setup.sh b/anti-evil-maid/90anti-evil-maid/module-setup.sh index 87491cf..1711435 100644 --- a/anti-evil-maid/90anti-evil-maid/module-setup.sh +++ b/anti-evil-maid/90anti-evil-maid/module-setup.sh @@ -57,7 +57,19 @@ install() { # all this crap below is needed for tcsd to start properly... dracut_install ip inst_simple "$moddir"/hosts /etc/hosts - inst_simple "$moddir"/passwd /etc/passwd - inst_simple "$moddir"/shadow /etc/shadow - inst_simple "$moddir"/shadow /etc/group + + touch "$initdir/etc/"{passwd,shadow,group} + chmod 0644 "$initdir/etc/"{passwd,group} + chmod 0640 "$initdir/etc/shadow" + for name in root tss; do + for file in /etc/{passwd,group}; do + if ! grep -q "^$name:" "$initdir/$file"; then + grep "^$name:" "$file" >> "$initdir/$file" + fi + done + + if ! grep -q "^$name:" "$initdir/etc/shadow"; then + echo "$name:*:::::::" >> "$initdir/etc/shadow" + fi + done } diff --git a/anti-evil-maid/90anti-evil-maid/passwd b/anti-evil-maid/90anti-evil-maid/passwd deleted file mode 100644 index fed7ee4..0000000 --- a/anti-evil-maid/90anti-evil-maid/passwd +++ /dev/null @@ -1,2 +0,0 @@ -root:x:0:0:root:/root:/bin/bash -tss:x:59:59:Account used by the trousers package to sandbox the tcsd daemon:/dev/null:/sbin/nologin diff --git a/anti-evil-maid/90anti-evil-maid/shadow b/anti-evil-maid/90anti-evil-maid/shadow deleted file mode 100644 index f64c6ea..0000000 --- a/anti-evil-maid/90anti-evil-maid/shadow +++ /dev/null @@ -1,2 +0,0 @@ -root:*:14715:0:99999:7::: -tss:!!:15217:::::: -- 2.8.1
0001-dracut-fix-etc-passwd-group-shadow-entries.patch.sig
Description: PGP signature
