From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: <ptxdist-bounces@pengutronix.de> Received: from mo4-p00-ob.smtp.rzone.de ([81.169.146.220]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from <artur@4wiebe.de>) id 1kl7T3-0002to-RI for ptxdist@pengutronix.de; Fri, 04 Dec 2020 10:33:35 +0100 Received: from home by smtp.strato.de (RZmta 47.3.4 DYNA|AUTH) with ESMTPSA id e08086wB49XXF2y (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256 bits)) (Client did not present a certificate) for <ptxdist@pengutronix.de>; Fri, 4 Dec 2020 10:33:33 +0100 (CET) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by home (Postfix) with ESMTP id C732B1A0257 for <ptxdist@pengutronix.de>; Fri, 4 Dec 2020 10:33:32 +0100 (CET) From: "Artur Wiebe" <artur@4wiebe.de> In-Reply-To: <20201204063256.GA3717075@pengutronix.de> Date: Fri, 04 Dec 2020 10:33:32 +0100 MIME-Version: 1.0 Message-ID: <2bebd7-5fca0280-15-dbde080@255940189> Subject: Re: [ptxdist] =?utf-8?b?Pz09P3V0Zi04P3E/ID89PT91dGYtOD9xPyBbUEFUQ0hd?= =?utf-8?q?_machine-id=3A_make_using_rc-once_optional?= List-Id: PTXdist Development Mailing List <ptxdist.pengutronix.de> List-Unsubscribe: <http://metis.pengutronix.de/cgi-bin/mailman/options/ptxdist>, <mailto:ptxdist-request@pengutronix.de?subject=unsubscribe> List-Archive: <http://metis.pengutronix.de/cgi-bin/mailman/private/ptxdist/> List-Post: <mailto:ptxdist@pengutronix.de> List-Help: <mailto:ptxdist-request@pengutronix.de?subject=help> List-Subscribe: <http://metis.pengutronix.de/cgi-bin/mailman/listinfo/ptxdist>, <mailto:ptxdist-request@pengutronix.de?subject=subscribe> Reply-To: ptxdist@pengutronix.de Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" <ptxdist-bounces@pengutronix.de> To: ptxdist@pengutronix.de Hi Michael, sorry, I misunderstood some parts of your review on the first reading. I think the new patch does what you suggested. Artur On Friday, December 04, 2020 07:32 CET, Michael Olbrich <m.olbrich@pengutronix.de> wrote: > On Mon, Nov 30, 2020 at 11:42:54AM +0100, Artur Wiebe wrote: > > If not set only an empty /etc/machine-id will be installed. > > I'm ok with keeping the prompt for MACHINE_ID_RC_ONCE, but you have ignored > all my other review as well. That still needs to be fixed. > > Michael > > > > > Signed-off-by: Artur Wiebe <artur@4wiebe.de> > > --- > > projectroot/etc/machine-id | 0 > > rules/machine-id.in | 22 ++++++++++++++++++---- > > rules/machine-id.make | 4 ++++ > > rules/machine-id.postinst | 5 +++-- > > 4 files changed, 25 insertions(+), 6 deletions(-) > > create mode 100644 projectroot/etc/machine-id > > > > diff --git a/projectroot/etc/machine-id b/projectroot/etc/machine-id > > new file mode 100644 > > index 000000000..e69de29bb > > diff --git a/rules/machine-id.in b/rules/machine-id.in > > index f18fec554..2a3901f41 100644 > > --- a/rules/machine-id.in > > +++ b/rules/machine-id.in > > @@ -1,11 +1,25 @@ > > ## SECTION=initmethod > > > > -config MACHINE_ID > > +menuconfig MACHINE_ID > > tristate > > prompt "create /etc/machine-id" > > - select RC_ONCE if RUNTIME > > - select UTIL_LINUX_NG if !INITMETHOD_SYSTEMD > > - select UTIL_LINUX_NG_UUIDGEN if !INITMETHOD_SYSTEMD > > + select RC_ONCE if MACHINE_ID_RC_ONCE && RUNTIME > > + select UTIL_LINUX_NG if MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD > > + select UTIL_LINUX_NG_UUIDGEN if MACHINE_ID_RC_ONCE && !INITMETHOD_SYSTEMD > > help > > Enable this to make sure there is always a unique /etc/machine-id > > available in the system. > > + > > +if MACHINE_ID > > + > > +config MACHINE_ID_RC_ONCE > > + bool "generate (bbinit) or save (systemd) machine-id using rc-once at first boot" > > + default y > > + help > > + If not set only an empty /etc/machine-id will be installed. > > + Systemd: > > + If /etc/machine-id exists and is empty, systemd will bind-mount > > + a file containing the new machine-id over it and later try > > + to commit it to disk (if /etc/ is writable). > > + > > +endif > > diff --git a/rules/machine-id.make b/rules/machine-id.make > > index 3883d64cb..5d66829da 100644 > > --- a/rules/machine-id.make > > +++ b/rules/machine-id.make > > @@ -27,7 +27,11 @@ $(STATEDIR)/machine-id.targetinstall: > > @$(call install_fixup,machine-id,AUTHOR,"Michael Olbrich <m.olbrich@pengutronix.de>") > > @$(call install_fixup,machine-id,DESCRIPTION,missing) > > > > + @$(call install_alternative, machine-id, 0, 0, 0444, /etc/machine-id) > > + > > +ifdef MACHINE_ID_RC_ONCE > > @$(call install_alternative, machine-id, 0, 0, 0755, /etc/rc.once.d/machine-id) > > +endif > > > > @$(call install_finish,machine-id) > > > > diff --git a/rules/machine-id.postinst b/rules/machine-id.postinst > > index 2060129d1..f1648226b 100644 > > --- a/rules/machine-id.postinst > > +++ b/rules/machine-id.postinst > > @@ -1,3 +1,4 @@ > > #!/bin/sh > > -touch "$DESTDIR/etc/machine-id" > > -$DESTDIR/usr/sbin/enable-rc-once machine-id > > +if [ -f $DESTDIR/etc/rc.once.d/machine-id ]; then > > + $DESTDIR/usr/sbin/enable-rc-once machine-id > > +fi > > -- > > 2.29.2 > > > > > > _______________________________________________ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de > > > > _______________________________________________ > ptxdist mailing list > ptxdist@pengutronix.de > To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de