Re: /etc/os-release isn't created
On Wed, Nov 18, 2020 at 4:16 AM Yasuhiro KIMURA wrote: > Dear Committers, > > From: Yasuhiro KIMURA > Subject: Re: /etc/os-release isn't created > Date: Wed, 22 Jan 2020 15:56:54 +0900 (JST) > > > I created patch adding logic that handles symbolik link to mergemaster > > and submitted it to following bug report. > > > > Bug 242212 usr.sbin/mergemaster/mergemaster.sh: There is no logic to > handle symbolic > > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242212 > > > > So please review and/or test it. > > Would someone please commit it? As is explained currently mergemaster > doesn't handle symbolic links. And it causes that /etc/os-release > symbolink link isn't created when it doesn't exit before upgrade and > you upgrade base system with steps described in /usr/src/Makefile. > It happens such cases as following. > > * 13-CURRENT before r354922 -> 13-CURRENT r354922 or later > * 12.1-RELEASE -> 12.2-RELEASE > * 11.4-RELEASE -> 12.2-RELEASE > I did some light testing and it seemed to work for me, so I've gone ahead and committed it as r367810. Thanks for the reminder. ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: /etc/os-release isn't created
Dear Committers, From: Yasuhiro KIMURA Subject: Re: /etc/os-release isn't created Date: Wed, 22 Jan 2020 15:56:54 +0900 (JST) > I created patch adding logic that handles symbolik link to mergemaster > and submitted it to following bug report. > > Bug 242212 usr.sbin/mergemaster/mergemaster.sh: There is no logic to handle > symbolic > https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242212 > > So please review and/or test it. Would someone please commit it? As is explained currently mergemaster doesn't handle symbolic links. And it causes that /etc/os-release symbolink link isn't created when it doesn't exit before upgrade and you upgrade base system with steps described in /usr/src/Makefile. It happens such cases as following. * 13-CURRENT before r354922 -> 13-CURRENT r354922 or later * 12.1-RELEASE -> 12.2-RELEASE * 11.4-RELEASE -> 12.2-RELEASE Best Regards. --- Yasuhiro KIMURA ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: /etc/os-release isn't created
From: Yasuhiro KIMURA
Subject: Re: /etc/os-release isn't created
Date: Mon, 25 Nov 2019 10:27:36 +0900 (JST)
> From: "Herbert J. Skuhra"
> Subject: Re: /etc/os-release isn't created
> Date: Mon, 25 Nov 2019 02:11:35 +0100
>
>> - mergemaster runs 'make distribution':
>> ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
>> - the link etc/os-release is created in /var/tmp/temproot when running
>> mergemaster but not moved to /
>
> Thank you for investigation. Then is is bug of mergemaster?
I created patch adding logic that handles symbolik link to mergemaster
and submitted it to following bug report.
Bug 242212 usr.sbin/mergemaster/mergemaster.sh: There is no logic to handle
symbolic
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242212
So please review and/or test it.
Best Regards.
---
Yasuhiro KIMURA
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: /etc/os-release isn't created
From: "Herbert J. Skuhra"
Subject: Re: /etc/os-release isn't created
Date: Mon, 25 Nov 2019 02:11:35 +0100
> - mergemaster runs 'make distribution':
> ${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
> - the link etc/os-release is created in /var/tmp/temproot when running
> mergemaster but not moved to /
Thank you for investigation. Then is is bug of mergemaster?
---
Yasuhiro KIMURA
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: /etc/os-release isn't created
On Mon, Nov 25, 2019 at 08:13:19AM +0900, Yasuhiro KIMURA wrote:
> distribution:
> .if !defined(DESTDIR)
> @echo "set DESTDIR before running \"make ${.TARGET}\""
> @false
> .endif
> ${_+_}cd ${.CURDIR}/gss; ${MAKE} install
> ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
> ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
> ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
> ${INSTALL_SYMLINK} ../var/run/os-release \
> ${DESTDIR}/etc/os-release
> yasu@rolling-vm-freebsd1[2105]%
>
> But 'make distribution' isn't executed by normal upgrade steps. So
> it's a bug and should be fixed.
- mergemaster runs 'make distribution':
${MM_MAKE} DESTDIR=${TEMPROOT} distribution >/dev/null;} ||
- the link etc/os-release is created in /var/tmp/temproot when running
mergemaster but not moved to /
--
Herbert
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: /etc/os-release isn't created
From: Yasuhiro KIMURA
Subject: Re: /etc/os-release isn't created
Date: Mon, 25 Nov 2019 08:13:19 +0900 (JST)
> I recieved report by private mail that /etc/os-release is created only
> when 'make distribution' is executed. And I found that's exactly what
> is written in /usr/src/etc/Makefile.
>
> yasu@rolling-vm-freebsd1[2103]% grep '\$FreeBSD' /usr/src/etc/Makefile
> # $FreeBSD: head/etc/Makefile 354922 2019-11-20 23:45:31Z imp $
> yasu@rolling-vm-freebsd1[2104]% tail +50 /usr/src/etc/Makefile | head -n 12
>
> distribution:
> .if !defined(DESTDIR)
> @echo "set DESTDIR before running \"make ${.TARGET}\""
> @false
> .endif
> ${_+_}cd ${.CURDIR}/gss; ${MAKE} install
> ${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
> ${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
> ${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
> ${INSTALL_SYMLINK} ../var/run/os-release \
> ${DESTDIR}/etc/os-release
> yasu@rolling-vm-freebsd1[2105]%
>
> But 'make distribution' isn't executed by normal upgrade steps. So
> it's a bug and should be fixed.
I submitted bug report about this problem to Bugzilla.
Bug 242212 /etc/os-release isn't created when you upgrade an existing
13-CURRENT host
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=242212
---
Yasuhiro KIMURA
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: /etc/os-release isn't created
From: Conrad Meyer
Subject: Re: /etc/os-release isn't created
Date: Sun, 24 Nov 2019 12:51:03 -0800
> Did you run etcupdate or mergemaster as part of updating your host?
Yes. I run 'mergemaster -Fi' after 'make installworld'
I recieved report by private mail that /etc/os-release is created only
when 'make distribution' is executed. And I found that's exactly what
is written in /usr/src/etc/Makefile.
yasu@rolling-vm-freebsd1[2103]% grep '\$FreeBSD' /usr/src/etc/Makefile
# $FreeBSD: head/etc/Makefile 354922 2019-11-20 23:45:31Z imp $
yasu@rolling-vm-freebsd1[2104]% tail +50 /usr/src/etc/Makefile | head -n 12
distribution:
.if !defined(DESTDIR)
@echo "set DESTDIR before running \"make ${.TARGET}\""
@false
.endif
${_+_}cd ${.CURDIR}/gss; ${MAKE} install
${_+_}cd ${.CURDIR}/mtree; ${MAKE} install
${_+_}cd ${SRCTOP}/share/termcap; ${MAKE} etc-termcap
${_+_}cd ${SRCTOP}/usr.sbin/rmt; ${MAKE} etc-rmt
${INSTALL_SYMLINK} ../var/run/os-release \
${DESTDIR}/etc/os-release
yasu@rolling-vm-freebsd1[2105]%
But 'make distribution' isn't executed by normal upgrade steps. So
it's a bug and should be fixed.
---
Yasuhiro KIMURA
___
freebsd-current@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
Re: /etc/os-release isn't created
Hi, Did you run etcupdate or mergemaster as part of updating your host? Best, Conrad On Sat, Nov 23, 2019 at 1:15 PM Yasuhiro KIMURA wrote: > > Hello, > > Yesterday I updated my 13-CURRENT host from r354592 to r355028 and > /etc/os-release symbolic link wasn't created. > > yasu@rolling-vm-freebsd1[2061]% uname -a > FreeBSD rolling-vm-freebsd1.home.utahime.org 13.0-CURRENT FreeBSD > 13.0-CURRENT #0 r355028: Sat Nov 23 22:35:58 JST 2019 > ro...@rolling-vm-freebsd1.home.utahime.org:/usr0/freebsd/base/obj/usr0/freebsd/base/head/amd64.amd64/sys/GENERIC > amd64 > yasu@rolling-vm-freebsd1[2062]% ls -l /etc/os-release > ls: /etc/os-release: No such file or directory > yasu@rolling-vm-freebsd1[2063]% > > But after that I made same update of 13-CURRENT poudriere jail and > then /etc/os-release was created in it. > > yasu@rolling-vm-freebsd1[2063]% ls -l > /usr/local/poudriere/jails/curamd64/etc/os-release > lrwxr-xr-x 1 root wheel 21 Nov 24 05:04 > /usr/local/poudriere/jails/curamd64/etc/os-release@ -> > ../var/run/os-releaseyasu@rolling-vm-freebsd1[2064]% > > Why such difference happens? > > --- > Yasuhiro KIMURA > ___ > freebsd-current@freebsd.org mailing list > https://lists.freebsd.org/mailman/listinfo/freebsd-current > To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org" ___ freebsd-current@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/freebsd-current To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
