diff options
Diffstat (limited to 'zarb-ml/mageia-dev/2012-May/015795.html')
| -rw-r--r-- | zarb-ml/mageia-dev/2012-May/015795.html | 136 |
1 files changed, 136 insertions, 0 deletions
diff --git a/zarb-ml/mageia-dev/2012-May/015795.html b/zarb-ml/mageia-dev/2012-May/015795.html new file mode 100644 index 000000000..64d145420 --- /dev/null +++ b/zarb-ml/mageia-dev/2012-May/015795.html @@ -0,0 +1,136 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN"> +<HTML> + <HEAD> + <TITLE> [Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize + </TITLE> + <LINK REL="Index" HREF="index.html" > + <LINK REL="made" HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B4584%5D%20%28systemd_unit_exists%29%0A%09factorize&In-Reply-To=%3C4FBD2E91.70009%40colin.guthr.ie%3E"> + <META NAME="robots" CONTENT="index,nofollow"> + <META http-equiv="Content-Type" content="text/html; charset=us-ascii"> + <LINK REL="Previous" HREF="015794.html"> + <LINK REL="Next" HREF="015796.html"> + </HEAD> + <BODY BGCOLOR="#ffffff"> + <H1>[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize</H1> + <B>Colin Guthrie</B> + <A HREF="mailto:mageia-dev%40mageia.org?Subject=Re%3A%20%5BMageia-dev%5D%20%5Bsoft-commits%5D%20%5B4584%5D%20%28systemd_unit_exists%29%0A%09factorize&In-Reply-To=%3C4FBD2E91.70009%40colin.guthr.ie%3E" + TITLE="[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize">mageia at colin.guthr.ie + </A><BR> + <I>Wed May 23 20:38:09 CEST 2012</I> + <P><UL> + <LI>Previous message: <A HREF="015794.html">[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize +</A></li> + <LI>Next message: <A HREF="015796.html">[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#15795">[ date ]</a> + <a href="thread.html#15795">[ thread ]</a> + <a href="subject.html#15795">[ subject ]</a> + <a href="author.html#15795">[ author ]</a> + </LI> + </UL> + <HR> +<!--beginarticle--> +<PRE>'Twas brillig, and Thierry Vignaud at 23/05/12 19:29 did gyre and gimble: +><i> On 23 May 2012 20:25, <<A HREF="https://www.mageia.org/mailman/listinfo/mageia-dev">root at mageia.org</A>> wrote: +</I>>><i> Revision 4584 Author tv Date 2012-05-23 20:25:15 +0200 (Wed, 23 May 2012) +</I>>><i> +</I>>><i> Log Message +</I>>><i> +</I>>><i> (systemd_unit_exists) factorize +</I>>><i> +</I>>><i> Modified Paths +</I>>><i> +</I>>><i> drakx/trunk/perl-install/services.pm +</I>>><i> +</I>>><i> Modified: drakx/trunk/perl-install/services.pm +</I>>><i> =================================================================== +</I>>><i> --- drakx/trunk/perl-install/services.pm 2012-05-23 18:02:37 UTC (rev 4583) +</I>>><i> +++ drakx/trunk/perl-install/services.pm 2012-05-23 18:25:15 UTC (rev 4584) +</I>>><i> @@ -433,7 +433,7 @@ +</I>>><i> if (my ($name, $l) = m!^(\S+)\s+(0:(on|off).*)!) { +</I>>><i> # If we expect to use systemd (i.e. installer) only show those +</I>>><i> # sysvinit scripts which are not masked by a native systemd +</I>>><i> unit. +</I>>><i> - my $has_systemd_unit = (-e "$::prefix/lib/systemd/system/$name.service" or -l "$::prefix/lib/systemd/system/$name.service"); +</I>>><i> + my $has_systemd_unit = systemd_unit_exists($name); +</I>>><i> if (!$has_systemd || !$has_systemd_unit) { +</I>>><i> if ($::isInstall) { +</I>>><i> $on_off = $l =~ /\d+:on/g; +</I>>><i> @@ -466,12 +466,14 @@ +</I>>><i> +</I>>><i> +</I>>><i> +</I>>><i> +sub systemd_unit_exists { +</I>>><i> + my ($name) = @_; +</I>>><i> + -e "$::prefix/lib/systemd/system/$name.service" or -l "$::prefix/lib/systemd/system/$name.service"; +</I>>><i> +} +</I>>><i> +</I>>><i> - +</I>>><i> - +</I>>><i> sub service_exists { +</I>>><i> my ($service) = @_; +</I>>><i> - -x "$::prefix/etc/rc.d/init.d/$service" or -e "$::prefix/lib/systemd/system/$service.service" or -l "$::prefix/lib/systemd/system/$service.service"; +</I>>><i> + -x "$::prefix/etc/rc.d/init.d/$service" or systemd_unit_exists($service); +</I>>><i> } +</I>><i> +</I>><i> BTW Colin your test is redundant. -e returns true for symlinks too +</I>><i> (unless target doesn't exist in which case we don't care much anyway...) +</I> +NAK. No it's not redundant it's very important. The symlinks *will* be +broken when run via the installer due to the $::prefix as they will +point to "non-existent" paths in /lib/systemd/ (not to +/mnt/lib/systemd...) so I treat any symlink that exists (even if it +points to an invalid unit) as "valid" here. + +I think I even said as much in a comment or the commit log that it's +important :) + +Col + + +-- + +Colin Guthrie +colin(at)mageia.org +<A HREF="http://colin.guthr.ie/">http://colin.guthr.ie/</A> + +Day Job: + Tribalogic Limited <A HREF="http://www.tribalogic.net/">http://www.tribalogic.net/</A> +Open Source: + Mageia Contributor <A HREF="http://www.mageia.org/">http://www.mageia.org/</A> + PulseAudio Hacker <A HREF="http://www.pulseaudio.org/">http://www.pulseaudio.org/</A> + Trac Hacker <A HREF="http://trac.edgewall.org/">http://trac.edgewall.org/</A> +</PRE> + + + + + + + + + + + + +<!--endarticle--> + <HR> + <P><UL> + <!--threads--> + <LI>Previous message: <A HREF="015794.html">[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize +</A></li> + <LI>Next message: <A HREF="015796.html">[Mageia-dev] [soft-commits] [4584] (systemd_unit_exists) factorize +</A></li> + <LI> <B>Messages sorted by:</B> + <a href="date.html#15795">[ date ]</a> + <a href="thread.html#15795">[ thread ]</a> + <a href="subject.html#15795">[ subject ]</a> + <a href="author.html#15795">[ author ]</a> + </LI> + </UL> + +<hr> +<a href="https://www.mageia.org/mailman/listinfo/mageia-dev">More information about the Mageia-dev +mailing list</a><br> +</body></html> |