API tools faq
paste
Advertisement
grahamperrin

Ugh, vi! helloSystem 0.3.0 (0C164) misleading partial record of upgrade of FreeBSDfrom 12.1 to 12.2

grahamperrin
Jan 17th, 2021
189
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.00 KB | None | 0 0
raw download clone embed print report
  1. .2610....2620....2630....2640....2650. done.
  2. Attempting to automatically merge changes in files... done.
  3.  
  4. The following file could not be merged automatically: /etc/pkg/FreeBSD.conf
  5. Press Enter to edit this file in /usr/bin/vi and resolve the conflicts
  6. manually...
  7.  
  8. <<<<<<< current version
  9. # $FreeBSD: releng/12.1/usr.sbin/pkg/FreeBSD.conf.release_2 346780 2019-04-27 04:00:50Z cperciva $
  10. # $FreeBSD: releng/12.2/usr.sbin/pkg/FreeBSD.conf.quarterly 346780 2019-04-27 04:00:50Z cperciva $
  11. #
  12. # To disable this repository, instead of modifying or removing this file,
  13. # create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
  14. #
  15. # mkdir -p /usr/local/etc/pkg/repos
  16. # echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
  17. #
  18.  
  19. FreeBSD: {
  20. url: "pkg+http://pkg.FreeBSD.org/${ABI}/release_2",
  21. mirror_type: "srv",
  22. signature_type: "fingerprints",
  23. fingerprints: "/usr/share/keys/pkg",
  24. enabled: yes
  25. }
  26. ~
  27. ~
  28. ~
  29. ~
  30. ~
  31. ~
  32. ~
  33. ~
  34. ~
  35. ~
  36. ~
  37. ~
  38. ~
  39. ~
  40. :q
  41.  
  42. The following file could not be merged automatically: /etc/ttys
  43. Press Enter to edit this file in /usr/bin/vi and resolve the conflicts
  44. manually...
  45.  
  46. <<<<<<< current version
  47. ttyv1 "/usr/libexec/getty Pc" xterm on secure
  48. #
  49. # $FreeBSD: releng/12.2/sbin/init/ttys.amd64 338454 2018-09-04 15:48:13Z brd $
  50. # @(#)ttys 5.1 (Berkeley) 4/17/89
  51. #
  52. # This file specifies various information about terminals on the system.
  53. # It is used by several different programs. Common entries for the
  54. # various columns include:
  55. #
  56. # name The name of the terminal device.
  57. #
  58. # getty The program to start running on the terminal. Typically a
  59. # getty program, as the name implies. Other common entries
  60. # include none, when no getty is needed, and xdm, to start the
  61. # X Window System.
  62. #
  63. # type The initial terminal type for this port. For hardwired
  64. # terminal lines, this will contain the type of terminal used.
  65. # For virtual consoles, the correct type is typically xterm.
  66. # Other common values include dialup for incoming modem ports, and
  67. # unknown when the terminal type cannot be predetermined.
  68. ttyv1 "/usr/libexec/getty Pc" xterm on secure
  69. #
  70. # $FreeBSD: releng/12.2/sbin/init/ttys.amd64 338454 2018-09-04 15:48:13Z brd $
  71. # @(#)ttys 5.1 (Berkeley) 4/17/89
  72. #
  73. # This file specifies various information about terminals on the system.
  74. # It is used by several different programs. Common entries for the
  75. # various columns include:
  76. #
  77. # name The name of the terminal device.
  78. #
  79. # getty The program to start running on the terminal. Typically a
  80. # getty program, as the name implies. Other common entries
  81. # include none, when no getty is needed, and xdm, to start the
  82. # X Window System.
  83. #
  84. # type The initial terminal type for this port. For hardwired
  85. # terminal lines, this will contain the type of terminal used.
  86. # For virtual consoles, the correct type is typically xterm.
  87. # Other common values include dialup for incoming modem ports, and
  88. # unknown when the terminal type cannot be predetermined.
  89. #
  90. # status Must be on or off. If on, init will run the getty program on
  91. # the specified port. If the word "secure" appears, this tty
  92. # allows root login.
  93. #
  94. # name getty type status comments
  95. #
  96. # If console is marked "insecure", then init will ask for the root password
  97. # when going to single-user mode.
  98. :q
  99.  
  100. The following changes, which occurred between FreeBSD 12.1-RELEASE and
  101. FreeBSD 12.2-RELEASE have been merged into /etc/group:
  102. --- current version
  103. +++ new version
  104. @@ -1,6 +1,6 @@
  105. -# $FreeBSD: releng/12.1/etc/group 336525 2018-07-19 23:55:29Z ian $
  106. +# $FreeBSD: releng/12.2/etc/group 359447 2020-03-30 17:07:05Z brooks $
  107. #
  108. wheel:*:0:root,grahamperrin
  109. daemon:*:1:
  110. kmem:*:2:
  111. sys:*:3:
  112. @@ -30,10 +30,11 @@
  113. audit:*:77:
  114. www:*:80:
  115. ntpd:*:123:
  116. _ypldap:*:160:
  117. hast:*:845:
  118. +tests:*:977:
  119. nogroup:*:65533:
  120. nobody:*:65534:
  121. messagebus:*:556:
  122. _tss:*:601:
  123. avahi:*:558:
  124. Does this look reasonable (y/n)? y
  125.  
  126. The following changes, which occurred between FreeBSD 12.1-RELEASE and
  127. FreeBSD 12.2-RELEASE have been merged into /etc/master.passwd:
  128. --- current version
  129. +++ new version
  130. @@ -1,6 +1,6 @@
  131. -# $FreeBSD: releng/12.1/etc/master.passwd 337882 2018-08-15 23:18:34Z brd $
  132. +# $FreeBSD: releng/12.2/etc/master.passwd 359447 2020-03-30 17:07:05Z brooks $
  133. #
  134. root:*LOCKED*:0:0::0:0:Charlie &:/root:/bin/csh
  135. toor:*:0:0::0:0:Bourne-again Superuser:/root:
  136. daemon:*:1:1::0:0:Owner of many system processes:/root:/usr/sbin/nologin
  137. operator:*:2:5::0:0:System &:/:/usr/sbin/nologin
  138. @@ -23,10 +23,11 @@
  139. auditdistd:*:78:77::0:0:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
  140. www:*:80:80::0:0:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
  141. ntpd:*:123:123::0:0:NTP Daemon:/var/db/ntp:/usr/sbin/nologin
  142. _ypldap:*:160:160::0:0:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin
  143. hast:*:845:845::0:0:HAST unprivileged user:/var/empty:/usr/sbin/nologin
  144. +tests:*:977:977::0:0:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin
  145. nobody:*:65534:65534::0:0:Unprivileged user:/nonexistent:/usr/sbin/nologin
  146. messagebus:*:556:556::0:0:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin
  147. _tss:*:601:601:daemon:0:0:TCG Software Stack user:/var/empty:/usr/sbin/nologin
  148. avahi:*:558:558::0:0:Avahi Daemon User:/nonexistent:/usr/sbin/nologin
  149. cups:*:193:193::0:0:Cups Owner:/nonexistent:/usr/sbin/nologin
  150. Does this look reasonable (y/n)? y
  151.  
  152. The following changes, which occurred between FreeBSD 12.1-RELEASE and
  153. FreeBSD 12.2-RELEASE have been merged into /etc/passwd:
  154. --- current version
  155. +++ new version
  156. @@ -1,6 +1,6 @@
  157. -# $FreeBSD: releng/12.1/etc/master.passwd 337882 2018-08-15 23:18:34Z brd $
  158. +# $FreeBSD: releng/12.2/etc/master.passwd 359447 2020-03-30 17:07:05Z brooks $
  159. #
  160. root:*:0:0:Charlie &:/root:/bin/csh
  161. toor:*:0:0:Bourne-again Superuser:/root:
  162. daemon:*:1:1:Owner of many system processes:/root:/usr/sbin/nologin
  163. operator:*:2:5:System &:/:/usr/sbin/nologin
  164. @@ -23,10 +23,11 @@
  165. auditdistd:*:78:77:Auditdistd unprivileged user:/var/empty:/usr/sbin/nologin
  166. www:*:80:80:World Wide Web Owner:/nonexistent:/usr/sbin/nologin
  167. ntpd:*:123:123:NTP Daemon:/var/db/ntp:/usr/sbin/nologin
  168. _ypldap:*:160:160:YP LDAP unprivileged user:/var/empty:/usr/sbin/nologin
  169. hast:*:845:845:HAST unprivileged user:/var/empty:/usr/sbin/nologin
  170. +tests:*:977:977:Unprivileged user for tests:/nonexistent:/usr/sbin/nologin
  171. nobody:*:65534:65534:Unprivileged user:/nonexistent:/usr/sbin/nologin
  172. messagebus:*:556:556:D-BUS Daemon User:/nonexistent:/usr/sbin/nologin
  173. _tss:*:601:601:TCG Software Stack user:/var/empty:/usr/sbin/nologin
  174. avahi:*:558:558:Avahi Daemon User:/nonexistent:/usr/sbin/nologin
  175. cups:*:193:193:Cups Owner:/nonexistent:/usr/sbin/nologin
  176. Does this look reasonable (y/n)? y
  177.  
  178. The following changes, which occurred between FreeBSD 12.1-RELEASE and
  179. FreeBSD 12.2-RELEASE have been merged into /etc/rc.shutdown:
  180. --- current version
  181. +++ new version
  182. @@ -31,11 +31,11 @@
  183. # HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  184. # LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  185. # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  186. # SUCH DAMAGE.
  187. #
  188. -# $FreeBSD: releng/12.1/libexec/rc/rc.shutdown 339413 2018-10-17 16:49:11Z bz $
  189. +# $FreeBSD: releng/12.2/libexec/rc/rc.shutdown 355480 2019-12-07 03:29:58Z emaste $
  190. #
  191.  
  192. # Site-specific closing actions for daemons run by init on shutdown,
  193. # or before going single-user from multi-user.
  194. # Output and errors are directed to console by init, and the
  195. @@ -50,10 +50,12 @@
  196.  
  197. HOME=/
  198. PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin
  199. export HOME PATH
  200.  
  201. +rc_shutdown=${1:-"unspecified"}
  202. +
  203. . /etc/rc.subr
  204.  
  205. load_rc_config
  206.  
  207. # reverse_list list
  208. @@ -77,10 +79,11 @@
  209. debug "Initiating watchdog timer."
  210. sleep $rcshutdown_timeout && (
  211. _msg="$rcshutdown_timeout second watchdog"
  212. _msg="$_msg timeout expired. Shutdown terminated."
  213. logger -t rc.shutdown "$_msg"
  214. + echo
  215. echo "$_msg"
  216. date
  217. kill -KILL $$ >/dev/null 2>&1
  218. ) &
  219. _rcshutdown_watchdog=$!
  220. Does this look reasonable (y/n)? y
  221.  
  222. The following changes, which occurred between FreeBSD 12.1-RELEASE and
  223. FreeBSD 12.2-RELEASE have been merged into /etc/ttys:
  224. --- current version
  225. +++ new version
  226. @@ -1 +1,50 @@
  227. ttyv1 "/usr/libexec/getty Pc" xterm on secure
  228. +#
  229. +# $FreeBSD: releng/12.2/sbin/init/ttys.amd64 338454 2018-09-04 15:48:13Z brd $
  230. +# @(#)ttys 5.1 (Berkeley) 4/17/89
  231. +#
  232. +# This file specifies various information about terminals on the system.
  233. +# It is used by several different programs. Common entries for the
  234. +# various columns include:
  235. +#
  236. +# name The name of the terminal device.
  237. +#
  238. +# getty The program to start running on the terminal. Typically a
  239. +# getty program, as the name implies. Other common entries
  240. +# include none, when no getty is needed, and xdm, to start the
  241. +# X Window System.
  242. +#
  243. +# type The initial terminal type for this port. For hardwired
  244. +# terminal lines, this will contain the type of terminal used.
  245. +# For virtual consoles, the correct type is typically xterm.
  246. +# Other common values include dialup for incoming modem ports, and
  247. +# unknown when the terminal type cannot be predetermined.
  248. +#
  249. +# status Must be on or off. If on, init will run the getty program on
  250. +# the specified port. If the word "secure" appears, this tty
  251. +# allows root login.
  252. +#
  253. +# name getty type status comments
  254. +#
  255. +# If console is marked "insecure", then init will ask for the root password
  256. +# when going to single-user mode.
  257. +console none unknown off secure
  258. +#
  259. +ttyv0 "/usr/libexec/getty Pc" xterm onifexists secure
  260. +# Virtual terminals
  261. +ttyv1 "/usr/libexec/getty Pc" xterm onifexists secure
  262. +ttyv2 "/usr/libexec/getty Pc" xterm onifexists secure
  263. +ttyv3 "/usr/libexec/getty Pc" xterm onifexists secure
  264. +ttyv4 "/usr/libexec/getty Pc" xterm onifexists secure
  265. +ttyv5 "/usr/libexec/getty Pc" xterm onifexists secure
  266. +ttyv6 "/usr/libexec/getty Pc" xterm onifexists secure
  267. +ttyv7 "/usr/libexec/getty Pc" xterm onifexists secure
  268. +ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure
  269. +# Serial terminals
  270. +# The 'dialup' keyword identifies dialin lines to login, fingerd etc.
  271. +ttyu0 "/usr/libexec/getty 3wire" vt100 onifconsole secure
  272. +ttyu1 "/usr/libexec/getty 3wire" vt100 onifconsole secure
  273. +ttyu2 "/usr/libexec/getty 3wire" vt100 onifconsole secure
  274. +ttyu3 "/usr/libexec/getty 3wire" vt100 onifconsole secure
  275. +# Dumb console
  276. +dcons "/usr/libexec/getty std.9600" vt100 off secure
  277. Does this look reasonable (y/n)? y
  278. The following files will be removed as part of updating to
  279. 12.2-RELEASE-p2:
  280.  
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
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!