Re: Upgrade from source to RC1: problems with /etc : lost users and dbus

From: Tom Evans <tevans.uk_at_googlemail.com>
Date: Fri, 28 Oct 2011 11:48:07 +0100
On Fri, Oct 28, 2011 at 11:05 AM, Thomas Mueller
<mueller6727_at_bellsouth.net> wrote:
> Update: the fix didn't work, even though I have the necessary things in master.passwd and /etc/rc.conf .

Did you re-run pwd_mkdb?

> How does one run mergemaster without running roughshod over existing configuration?
>

So when mergemaster runs, it will ask you if you want to (i)nstall
(d)elete or (m)erge the changes. If there are no additions to the file
- eg new users or groups from the source - then you can just delete
the update.

If there are new users/groups, you need to merge them in. If you
choose merge for /etc/group and /etc/master.passwd, it will show you
the differences, and ask you to choose from the option on the left
(your original file) or the right (the updated file) to merge them in.

Cheers

Tom

PS
Here is a log of me updating my /etc/group, as a new group 'hast' has
been added that is not in my /etc/group

 *** Displaying differences between ./etc/group and installed version:

--- /etc/group  2011-05-05 10:54:43.000000000 +0100
+++ ./etc/group 2011-10-28 11:39:54.000000000 +0100
_at__at_ -1,11 +1,11 _at__at_
-# $FreeBSD: src/etc/group,v 1.35.10.1.6.1 2010/12/21 17:09:25 kensmith Exp $
+# $FreeBSD: stable/8/etc/group 220104 2011-03-28 17:41:10Z trociny $
 #
-wheel:*:0:root,tom
+wheel:*:0:root
 daemon:*:1:
 kmem:*:2:
 sys:*:3:
 tty:*:4:
-operator:*:5:root,tom
+operator:*:5:root
 mail:*:6:
 bin:*:7:
 news:*:8:
_at__at_ -26,21 +26,7 _at__at_
 dialer:*:68:
 network:*:69:
 audit:*:77:
-www:*:80:tom
+www:*:80:
+hast:*:845:
 nogroup:*:65533:
 nobody:*:65534:
-tom:*:1001:
-cyrus:*:60:
-messagebus:*:556:
-avahi:*:558:
-polkit:*:562:
-haldaemon:*:560:
-pulse:*:563:
-pulse-access:*:564:
-pulse-rt:*:557:
-gdm:*:92:
-pgsql:*:70:
-rabbitmq:*:135:
-_sabnzbd:*:350:
-squid:*:100:
-webcamd:*:145:tom

  Use 'd' to delete the temporary ./etc/group
  Use 'i' to install the temporary ./etc/group
  Use 'm' to merge the temporary and installed versions
  Use 'v' to view the diff results again

  Default is to leave the temporary file to deal with by hand

How should I deal with this? [Leave it for later] m


# $FreeBSD: src/etc/group,v 1.35.10.1.6.1 2010/12/21 17:09:25 kensmith
Exp $  |	# $FreeBSD: stable/8/etc/group 220104 2011-03-28 17:41:10Z
trociny $
%r
wheel:*:0:root,tom							      |	wheel:*:0:root
%l
operator:*:5:root,tom							      |	operator:*:5:root
%l
www:*:80:tom								      |	www:*:80:
									      >	hast:*:845:
%r
tom:*:1001:								      <
cyrus:*:60:								      <
messagebus:*:556:							      <
avahi:*:558:								      <
polkit:*:562:								      <
haldaemon:*:560:							      <
pulse:*:563:								      <
pulse-access:*:564:							      <
pulse-rt:*:557:								      <
gdm:*:92:								      <
pgsql:*:70:								      <
rabbitmq:*:135:								      <
_sabnzbd:*:350:								      <
squid:*:100:								      <
webcamd:*:145:tom							      <
%l

  Use 'i' to install merged file
  Use 'r' to re-do the merge
  Use 'v' to view the merged file
  Default is to leave the temporary file to deal with by hand

    *** How should I deal with the merged file? [Leave it for later] v
# $FreeBSD: stable/8/etc/group 220104 2011-03-28 17:41:10Z trociny $
#
wheel:*:0:root,tom
daemon:*:1:
kmem:*:2:
sys:*:3:
tty:*:4:
operator:*:5:root,tom
mail:*:6:
bin:*:7:
news:*:8:
man:*:9:
games:*:13:
ftp:*:14:
staff:*:20:
sshd:*:22:
smmsp:*:25:
mailnull:*:26:
guest:*:31:
bind:*:53:
proxy:*:62:
authpf:*:63:
_pflogd:*:64:
_dhcp:*:65:
uucp:*:66:
dialer:*:68:
network:*:69:
audit:*:77:
www:*:80:
hast:*:845:
nogroup:*:65533:
nobody:*:65534:
tom:*:1001:
cyrus:*:60:
messagebus:*:556:
avahi:*:558:
polkit:*:562:
haldaemon:*:560:
pulse:*:563:
pulse-access:*:564:
pulse-rt:*:557:
gdm:*:92:
pgsql:*:70:
rabbitmq:*:135:
_sabnzbd:*:350:
squid:*:100:
webcamd:*:145:tom

  Use 'i' to install merged file
  Use 'r' to re-do the merge
  Use 'v' to view the merged file
  Default is to leave the temporary file to deal with by hand

    *** How should I deal with the merged file? [Leave it for later]

As you can see, the new file contains the changes from the update (it
has the 'hast' group) plus the changes that were in my local
/etc/group, and now I can tell mergemaster to install it (although it
has managed to drop me from the www group, hand modification
required!)
Received on Fri Oct 28 2011 - 08:48:08 UTC

This archive was generated by hypermail 2.4.0 : Wed May 19 2021 - 11:40:19 UTC