您尚未登录。

#1 2015-02-25 21:24:26

shom
会员
注册时间: 2015-01-24
帖子: 4

upgraded filesystem (2014.10-3 -> 2015.02-1)的问题

请问一下这个需要手动合并还是不用理它?
按我的理解应该不用管它就行了
diff /etc/group{,.pacnew}

11c11
< wheel:x:10:root
---
> wheel:x:10:root,shom
14c14
< uucp:x:14:
---
> uucp:x:14:shom
18c18
< rfkill:x:24:
---
> rfkill:x:24:shom
20d19
< proc:x:26:
26,29c25,28
< network:x:90:
< video:x:91:
< audio:x:92:
< optical:x:93:
---
> network:x:90:shom
> video:x:91:shom
> audio:x:92:shom
> optical:x:93:shom
31c30
< storage:x:95:
---
> storage:x:95:shom
34c33
< power:x:98:
---
> power:x:98:shom
42a42,50
> systemd-journal-remote:x:999:
> systemd-journal-upload:x:998:
> polkitd:x:102:
> avahi:x:84:
> git:x:997:
> lightdm:x:620:
> autologin:x:1002:shom
> rtkit:x:133:
> proc:x:26:

diff /etc/gshadow{,.pacnew}

11c11
< wheel:::root,shom
---
> wheel:::root
14c14
< uucp:::shom
---
> uucp:::
18c18
< rfkill:x::shom
---
> rfkill:x::
19a20
> proc:::
25,28c26,29
< network:x::shom
< video:x::shom
< audio:::shom
< optical:::shom
---
> network:x::
> video:x::
> audio:::
> optical:::
30c31
< storage:x::shom
---
> storage:x::
33c34
< power:x::shom
---
> power:x::
42,50d42
< systemd-journal-remote:!!::
< systemd-journal-upload:!!::
< polkitd:!::
< avahi:!::
< git:!::
< lightdm:!::
< autologin:!::shom
< rtkit:!::
< proc:!::

离线

#2 2015-02-25 23:14:20

atmouse
会员
注册时间: 2011-08-24
帖子: 672

Re: upgraded filesystem (2014.10-3 -> 2015.02-1)的问题

不用理他,

还有用diff -u 比较好吧,格式看起来清楚些


Raspberry pi 3, PHA-2A/DT1770Pro,
linux-raspberrypi, systemd, pacman, vc4, xorg, qtile, chrome,

离线

#3 2015-02-26 13:46:18

shom
会员
注册时间: 2015-01-24
帖子: 4

Re: upgraded filesystem (2014.10-3 -> 2015.02-1)的问题

atmouse 说:

不用理他,

还有用diff -u 比较好吧,格式看起来清楚些


非常感谢,兄台提醒的是,下次会注意

离线

页脚