Hi Adam, On 15.02.2013 16:24, Adam D. Barratt wrote: > On Fri, 2013-02-15 at 14:09 +0100, Michael Biebl wrote: >> Please unblock package systemd >> >> It fixes a couple of annoying issues. Especially #673309 and #692150 are >> rather important. The implemented fixes are mostly workarounds to make >> systemd integrate better in wheezy. > > Unblocked; thanks.
Thanks for being so quick with the unblock! Unfortunately I didn't notice a rare corner case so I did a followup upload, but you beat me to it :-) The diff is rather small (attached). Would be great if you can update the unblock accordingly. Thanks, Michael unblock systemd/44-10 -- Why is it that all of the instruments seeking intelligent life in the universe are pointed away from Earth?
diff --git a/debian/changelog b/debian/changelog index cfcb136..e89a411 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +systemd (44-10) unstable; urgency=low + + * Team upload. + * Using the return code of "systemctl is-enabled" to determine whether we + enable a service or not is unreliable since it also returns a non-zero + exit code for masked services. As we don't want to enable masked services, + grep for the string "disabled" instead. + + -- Michael Biebl <bi...@debian.org> Fri, 15 Feb 2013 17:01:24 +0100 + systemd (44-9) unstable; urgency=low * Team upload. diff --git a/debian/debian-enable-units b/debian/debian-enable-units index 63db656..d231d75 100755 --- a/debian/debian-enable-units +++ b/debian/debian-enable-units @@ -33,7 +33,9 @@ done < $blacklist # Get entries which need to be enabled needs_enable=$(mktemp) while read unit ; do - systemctl is-enabled "$unit" >/dev/null || echo "$unit" >> $needs_enable + if systemctl is-enabled "$unit" 2> /dev/null | grep -q "disabled"; then + echo "$unit" >> $needs_enable + fi done < $installed
signature.asc
Description: OpenPGP digital signature
