| Message ID | 20191111172443.6874-10-jeremy.rosen@smile.fr |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | use host-systemd to enable units | expand |
Jérémy, All, On 2019-11-11 18:24 +0100, Jérémy Rosen spake thusly: > all services were installed but not enabled. > This change enables the service but not the templates > > Enabling the templates creates weird links which are probably an > upstream bug. Missing SoB line... > --- > package/wpa_supplicant/50-wpa_supplicant.preset | 4 ++++ > package/wpa_supplicant/wpa_supplicant.mk | 2 ++ > 2 files changed, 6 insertions(+) > create mode 100644 package/wpa_supplicant/50-wpa_supplicant.preset > > diff --git a/package/wpa_supplicant/50-wpa_supplicant.preset b/package/wpa_supplicant/50-wpa_supplicant.preset > new file mode 100644 > index 0000000000..9af8562c0e > --- /dev/null > +++ b/package/wpa_supplicant/50-wpa_supplicant.preset > @@ -0,0 +1,4 @@ > +disable wpa_supplicant@.service In the commit log, you say "This change enables the service", but it looks like you are actually disabling it, no? Regards, Yann E. MORIN. > +disable wpa_supplicant-nl80211@.service > +disable wpa_supplicant-wired@.service > + > diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk > index 9dcebca9bf..42b12b1fb4 100644 > --- a/package/wpa_supplicant/wpa_supplicant.mk > +++ b/package/wpa_supplicant/wpa_supplicant.mk > @@ -227,6 +227,8 @@ define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD > $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service > $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \ > $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired@.service > + $(INSTALL) -D -m 644 package/wpa_supplicant/50-wpa_supplicant.preset \ > + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-wpa_supplicant.preset > endef > > $(eval $(generic-package)) > -- > 2.24.0.rc1 > > _______________________________________________ > buildroot mailing list > buildroot@busybox.net > http://lists.busybox.net/mailman/listinfo/buildroot
> > --- > > package/wpa_supplicant/50-wpa_supplicant.preset | 4 ++++ > > package/wpa_supplicant/wpa_supplicant.mk | 2 ++ > > 2 files changed, 6 insertions(+) > > create mode 100644 package/wpa_supplicant/50-wpa_supplicant.preset > > > > diff --git a/package/wpa_supplicant/50-wpa_supplicant.preset > b/package/wpa_supplicant/50-wpa_supplicant.preset > > new file mode 100644 > > index 0000000000..9af8562c0e > > --- /dev/null > > +++ b/package/wpa_supplicant/50-wpa_supplicant.preset > > @@ -0,0 +1,4 @@ > > +disable wpa_supplicant@.service > > In the commit log, you say "This change enables the service", but it > looks like you are actually disabling it, no? > > My terminology is not completely clear, but I just checked and the patch is correct * I now enable (implicitely) the non-template services * I explicitely disable the templated services I will clarify the commit messages (I am also trying to fix this in upstream systemd, but it's tricky to get right)
diff --git a/package/wpa_supplicant/50-wpa_supplicant.preset b/package/wpa_supplicant/50-wpa_supplicant.preset new file mode 100644 index 0000000000..9af8562c0e --- /dev/null +++ b/package/wpa_supplicant/50-wpa_supplicant.preset @@ -0,0 +1,4 @@ +disable wpa_supplicant@.service +disable wpa_supplicant-nl80211@.service +disable wpa_supplicant-wired@.service + diff --git a/package/wpa_supplicant/wpa_supplicant.mk b/package/wpa_supplicant/wpa_supplicant.mk index 9dcebca9bf..42b12b1fb4 100644 --- a/package/wpa_supplicant/wpa_supplicant.mk +++ b/package/wpa_supplicant/wpa_supplicant.mk @@ -227,6 +227,8 @@ define WPA_SUPPLICANT_INSTALL_INIT_SYSTEMD $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-nl80211@.service $(INSTALL) -m 0644 -D $(@D)/$(WPA_SUPPLICANT_SUBDIR)/systemd/wpa_supplicant-wired@.service \ $(TARGET_DIR)/usr/lib/systemd/system/wpa_supplicant-wired@.service + $(INSTALL) -D -m 644 package/wpa_supplicant/50-wpa_supplicant.preset \ + $(TARGET_DIR)/usr/lib/systemd/system-preset/50-wpa_supplicant.preset endef $(eval $(generic-package))