API tools faq
paste
grahamperrin

FreeBSD 12.0-ALPHA1 peculiarities with mergemaster

grahamperrin
Aug 11th, 2018
236
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.28 KB | None | 0 0
raw download clone embed print report
  1. # date ; uname -v ; whoami
  2. Sat 11 Aug 2018 07:53:43 BST
  3. FreeBSD 12.0-ALPHA1 #8 r337582: Sat Aug 11 06:20:55 BST 2018 root@momh167-gjp4-hpelitebook8570p-freebsd:/usr/obj/usr/src/amd64.amd64/sys/GENERIC
  4. root
  5. # mergemaster -Ui
  6.  
  7. *** The directory specified for the temporary root environment,
  8. /var/tmp/temproot, exists. This can be a security risk if untrusted
  9. users have access to the system.
  10.  
  11. Use 'd' to delete the old /var/tmp/temproot and continue
  12. Use 't' to select a new temporary root directory
  13. Use 'e' to exit mergemaster
  14.  
  15. Default is to use /var/tmp/temproot as is
  16.  
  17. How should I deal with this? [Use the existing /var/tmp/temproot]
  18.  
  19. *** Leaving /var/tmp/temproot intact
  20.  
  21. *** Creating the temporary root environment in /var/tmp/temproot
  22. *** /var/tmp/temproot ready for use
  23. *** Creating and populating directory structure in /var/tmp/temproot
  24.  
  25.  
  26.  
  27. *** Beginning comparison
  28.  
  29. *** Checking /etc/rc.d for stale files
  30.  
  31. *** No stale files found
  32.  
  33. *** The installed file /boot has the type "symbolic link"
  34. but the new version has the type "directory"
  35.  
  36. How would you like to handle this?
  37.  
  38. Use 'r' to remove /boot
  39. You will be able to install it as a "directory"
  40.  
  41. Use 'i' to ignore this
  42.  
  43. How to proceed? [i]
  44.  
  45. *** See the man page about adding /boot to the list of IGNORE_FILES
  46. *** Press the [Enter] or [Return] key to continue
  47.  
  48. *** Temp ./.cshrc and installed have the same Id, deleting
  49.  
  50. ======================================================================
  51.  
  52. *** Displaying differences between ./.profile and installed version:
  53.  
  54. --- /.profile 2018-03-02 16:29:46.110022000 +0000
  55. +++ ./.profile 2018-08-11 07:53:52.030835000 +0100
  56. @@ -1,4 +1,4 @@
  57. -# $FreeBSD: head/etc/root/dot.profile 320678 2017-07-05 15:42:33Z trasz $
  58. +# $FreeBSD: head/etc/root/dot.profile 337497 2018-08-08 19:24:20Z asomers $
  59. #
  60. PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
  61. export PATH
  62. @@ -6,7 +6,7 @@
  63. export HOME
  64. TERM=${TERM:-xterm}
  65. export TERM
  66. -PAGER=more
  67. +PAGER=less
  68. export PAGER
  69.  
  70. # Query terminal size; useful for serial lines.
  71. @@ -14,6 +14,3 @@
  72.  
  73. # Uncomment to display a random cookie on each login.
  74. # if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi
  75. -
  76. -export PATH="$HOME/.cargo/bin:$PATH"
  77. -source /root/.cargo/env
  78.  
  79. Use 'd' to delete the temporary ./.profile
  80. Use 'i' to install the temporary ./.profile
  81. Use 'm' to merge the temporary and installed versions
  82. Use 'v' to view the diff results again
  83.  
  84. Default is to leave the temporary file to deal with by hand
  85.  
  86. How should I deal with this? [Leave it for later]
  87.  
  88. *** ./.profile will remain for your consideration
  89.  
  90. *** Temp ./boot/device.hints and installed have the same Id, deleting
  91. *** Temp ./COPYRIGHT and installed have the same Id, deleting
  92. *** Temp ./etc/amd.map and installed have the same Id, deleting
  93. *** Temp ./etc/auto_master and installed have the same Id, deleting
  94. *** Temp ./etc/autofs/include_ldap and installed have the same Id, deleting
  95. *** Temp ./etc/autofs/include_nis and installed have the same Id, deleting
  96. *** Temp ./etc/autofs/include_nis_nullfs and installed have the same Id, deleting
  97. *** Temp ./etc/autofs/special_hosts and installed have the same Id, deleting
  98. *** Temp ./etc/autofs/special_media and installed have the same Id, deleting
  99. *** Temp ./etc/autofs/special_noauto and installed have the same Id, deleting
  100. *** Temp ./etc/autofs/special_null and installed have the same Id, deleting
  101. *** Temp ./etc/blacklistd.conf and installed have the same Id, deleting
  102. *** Temp ./etc/bluetooth/hcsecd.conf and installed have the same Id, deleting
  103. *** Temp ./etc/bluetooth/hosts and installed have the same Id, deleting
  104. *** Temp ./etc/bluetooth/protocols and installed have the same Id, deleting
  105. *** Temp ./etc/cron.d/at and installed have the same Id, deleting
  106. *** Temp ./etc/crontab and installed have the same Id, deleting
  107. *** Temp ./etc/csh.cshrc and installed have the same Id, deleting
  108. *** Temp ./etc/csh.login and installed have the same Id, deleting
  109. *** Temp ./etc/csh.logout and installed have the same Id, deleting
  110. *** Temp ./etc/ddb.conf and installed have the same Id, deleting
  111. *** Temp ./etc/defaults/bluetooth.device.conf and installed have the same Id, deleting
  112. *** Temp ./etc/defaults/devfs.rules and installed have the same Id, deleting
  113. *** Temp ./etc/defaults/periodic.conf and installed have the same Id, deleting
  114. *** Temp ./etc/defaults/rc.conf and installed have the same Id, deleting
  115. *** Temp ./etc/devd.conf and installed have the same Id, deleting
  116. *** Temp ./etc/devd/asus.conf and installed have the same Id, deleting
  117. *** Temp ./etc/devd/devmatch.conf and installed have the same Id, deleting
  118. *** Temp ./etc/devd/hyperv.conf and installed have the same Id, deleting
  119. *** Temp ./etc/devd/uath.conf and installed have the same Id, deleting
  120. *** Temp ./etc/devd/ulpt.conf and installed have the same Id, deleting
  121. *** Temp ./etc/devd/zfs.conf and installed have the same Id, deleting
  122. *** Temp ./etc/devfs.conf and installed have the same Id, deleting
  123. *** Temp ./etc/dhclient.conf and installed have the same Id, deleting
  124. *** Temp ./etc/disktab and installed have the same Id, deleting
  125. *** Temp ./etc/dma/dma.conf and installed have the same Id, deleting
  126. *** Temp ./etc/fbtab and installed have the same Id, deleting
  127. *** Temp ./etc/freebsd-update.conf and installed have the same Id, deleting
  128. *** Temp ./etc/ftpusers and installed have the same Id, deleting
  129. *** Temp ./etc/gettytab and installed have the same Id, deleting
  130.  
  131. ======================================================================
  132.  
  133. *** Displaying differences between ./etc/group and installed version:
  134.  
  135. --- /etc/group 2018-08-11 07:21:06.876837000 +0100
  136. +++ ./etc/group 2018-08-11 07:53:50.883639000 +0100
  137. @@ -1,12 +1,12 @@
  138. -# $FreeBSD: head/etc/group 294896 2016-01-27 06:28:56Z araujo $
  139. +# $FreeBSD: head/etc/group 336525 2018-07-19 23:55:29Z ian $
  140. #
  141. -wheel:*:0:root,bbsadmin-l,grahamperrin
  142. +wheel:*:0:root
  143. daemon:*:1:
  144. kmem:*:2:
  145. sys:*:3:
  146. tty:*:4:
  147. -operator:*:5:root,grahamperrin,bbsadmin-l
  148. -mail:*:6:clamav
  149. +operator:*:5:root
  150. +mail:*:6:
  151. bin:*:7:
  152. news:*:8:
  153. man:*:9:
  154. @@ -17,7 +17,7 @@
  155. smmsp:*:25:
  156. mailnull:*:26:
  157. guest:*:31:
  158. -video:*:44:grahamperrin
  159. +video:*:44:
  160. bind:*:53:
  161. unbound:*:59:
  162. proxy:*:62:
  163. @@ -29,32 +29,8 @@
  164. network:*:69:
  165. audit:*:77:
  166. www:*:80:
  167. +ntpd:*:123:
  168. _ypldap:*:160:
  169. hast:*:845:
  170. nogroup:*:65533:
  171. nobody:*:65534:
  172. -bbsadmin-l:*:1001:
  173. -_tss:*:601:
  174. -messagebus:*:556:
  175. -avahi:*:558:
  176. -cups:*:193:
  177. -git_daemon:*:964:
  178. -polkitd:*:565:
  179. -polkit:*:562:
  180. -haldaemon:*:560:
  181. -grahamperrin:*:1004:
  182. -colord:*:970:
  183. -sddm:*:217:
  184. -webcamd:*:145:grahamperrin
  185. -vboxusers:*:920:grahamperrin,bbsadmin-l
  186. -pulse:*:563:
  187. -pulse-access:*:564:
  188. -pulse-rt:*:557:
  189. -cyrus:*:60:
  190. -mysql:*:88:
  191. -saned:*:194:
  192. -transmission:*:921:
  193. -gdm:*:92:
  194. -clamav:*:106:
  195. -nagios:*:181:www
  196. -ntpd:*:123:
  197.  
  198. Use 'd' to delete the temporary ./etc/group
  199. Use 'i' to install the temporary ./etc/group
  200. Use 'm' to merge the temporary and installed versions
  201. Use 'v' to view the diff results again
  202.  
  203. Default is to leave the temporary file to deal with by hand
  204.  
  205. How should I deal with this? [Leave it for later] ^C
  206. # exit
  207. root@momh167-gjp4-hpelitebook8570p-freebsd:~ #
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!