Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- # date ; uname -v ; whoami
- Sat 11 Aug 2018 07:53:43 BST
- 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
- root
- # mergemaster -Ui
- *** The directory specified for the temporary root environment,
- /var/tmp/temproot, exists. This can be a security risk if untrusted
- users have access to the system.
- Use 'd' to delete the old /var/tmp/temproot and continue
- Use 't' to select a new temporary root directory
- Use 'e' to exit mergemaster
- Default is to use /var/tmp/temproot as is
- How should I deal with this? [Use the existing /var/tmp/temproot]
- *** Leaving /var/tmp/temproot intact
- *** Creating the temporary root environment in /var/tmp/temproot
- *** /var/tmp/temproot ready for use
- *** Creating and populating directory structure in /var/tmp/temproot
- *** Beginning comparison
- *** Checking /etc/rc.d for stale files
- *** No stale files found
- *** The installed file /boot has the type "symbolic link"
- but the new version has the type "directory"
- How would you like to handle this?
- Use 'r' to remove /boot
- You will be able to install it as a "directory"
- Use 'i' to ignore this
- How to proceed? [i]
- *** See the man page about adding /boot to the list of IGNORE_FILES
- *** Press the [Enter] or [Return] key to continue
- *** Temp ./.cshrc and installed have the same Id, deleting
- ======================================================================
- *** Displaying differences between ./.profile and installed version:
- --- /.profile 2018-03-02 16:29:46.110022000 +0000
- +++ ./.profile 2018-08-11 07:53:52.030835000 +0100
- @@ -1,4 +1,4 @@
- -# $FreeBSD: head/etc/root/dot.profile 320678 2017-07-05 15:42:33Z trasz $
- +# $FreeBSD: head/etc/root/dot.profile 337497 2018-08-08 19:24:20Z asomers $
- #
- PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin:~/bin
- export PATH
- @@ -6,7 +6,7 @@
- export HOME
- TERM=${TERM:-xterm}
- export TERM
- -PAGER=more
- +PAGER=less
- export PAGER
- # Query terminal size; useful for serial lines.
- @@ -14,6 +14,3 @@
- # Uncomment to display a random cookie on each login.
- # if [ -x /usr/bin/fortune ] ; then /usr/bin/fortune -s ; fi
- -
- -export PATH="$HOME/.cargo/bin:$PATH"
- -source /root/.cargo/env
- Use 'd' to delete the temporary ./.profile
- Use 'i' to install the temporary ./.profile
- 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]
- *** ./.profile will remain for your consideration
- *** Temp ./boot/device.hints and installed have the same Id, deleting
- *** Temp ./COPYRIGHT and installed have the same Id, deleting
- *** Temp ./etc/amd.map and installed have the same Id, deleting
- *** Temp ./etc/auto_master and installed have the same Id, deleting
- *** Temp ./etc/autofs/include_ldap and installed have the same Id, deleting
- *** Temp ./etc/autofs/include_nis and installed have the same Id, deleting
- *** Temp ./etc/autofs/include_nis_nullfs and installed have the same Id, deleting
- *** Temp ./etc/autofs/special_hosts and installed have the same Id, deleting
- *** Temp ./etc/autofs/special_media and installed have the same Id, deleting
- *** Temp ./etc/autofs/special_noauto and installed have the same Id, deleting
- *** Temp ./etc/autofs/special_null and installed have the same Id, deleting
- *** Temp ./etc/blacklistd.conf and installed have the same Id, deleting
- *** Temp ./etc/bluetooth/hcsecd.conf and installed have the same Id, deleting
- *** Temp ./etc/bluetooth/hosts and installed have the same Id, deleting
- *** Temp ./etc/bluetooth/protocols and installed have the same Id, deleting
- *** Temp ./etc/cron.d/at and installed have the same Id, deleting
- *** Temp ./etc/crontab and installed have the same Id, deleting
- *** Temp ./etc/csh.cshrc and installed have the same Id, deleting
- *** Temp ./etc/csh.login and installed have the same Id, deleting
- *** Temp ./etc/csh.logout and installed have the same Id, deleting
- *** Temp ./etc/ddb.conf and installed have the same Id, deleting
- *** Temp ./etc/defaults/bluetooth.device.conf and installed have the same Id, deleting
- *** Temp ./etc/defaults/devfs.rules and installed have the same Id, deleting
- *** Temp ./etc/defaults/periodic.conf and installed have the same Id, deleting
- *** Temp ./etc/defaults/rc.conf and installed have the same Id, deleting
- *** Temp ./etc/devd.conf and installed have the same Id, deleting
- *** Temp ./etc/devd/asus.conf and installed have the same Id, deleting
- *** Temp ./etc/devd/devmatch.conf and installed have the same Id, deleting
- *** Temp ./etc/devd/hyperv.conf and installed have the same Id, deleting
- *** Temp ./etc/devd/uath.conf and installed have the same Id, deleting
- *** Temp ./etc/devd/ulpt.conf and installed have the same Id, deleting
- *** Temp ./etc/devd/zfs.conf and installed have the same Id, deleting
- *** Temp ./etc/devfs.conf and installed have the same Id, deleting
- *** Temp ./etc/dhclient.conf and installed have the same Id, deleting
- *** Temp ./etc/disktab and installed have the same Id, deleting
- *** Temp ./etc/dma/dma.conf and installed have the same Id, deleting
- *** Temp ./etc/fbtab and installed have the same Id, deleting
- *** Temp ./etc/freebsd-update.conf and installed have the same Id, deleting
- *** Temp ./etc/ftpusers and installed have the same Id, deleting
- *** Temp ./etc/gettytab and installed have the same Id, deleting
- ======================================================================
- *** Displaying differences between ./etc/group and installed version:
- --- /etc/group 2018-08-11 07:21:06.876837000 +0100
- +++ ./etc/group 2018-08-11 07:53:50.883639000 +0100
- @@ -1,12 +1,12 @@
- -# $FreeBSD: head/etc/group 294896 2016-01-27 06:28:56Z araujo $
- +# $FreeBSD: head/etc/group 336525 2018-07-19 23:55:29Z ian $
- #
- -wheel:*:0:root,bbsadmin-l,grahamperrin
- +wheel:*:0:root
- daemon:*:1:
- kmem:*:2:
- sys:*:3:
- tty:*:4:
- -operator:*:5:root,grahamperrin,bbsadmin-l
- -mail:*:6:clamav
- +operator:*:5:root
- +mail:*:6:
- bin:*:7:
- news:*:8:
- man:*:9:
- @@ -17,7 +17,7 @@
- smmsp:*:25:
- mailnull:*:26:
- guest:*:31:
- -video:*:44:grahamperrin
- +video:*:44:
- bind:*:53:
- unbound:*:59:
- proxy:*:62:
- @@ -29,32 +29,8 @@
- network:*:69:
- audit:*:77:
- www:*:80:
- +ntpd:*:123:
- _ypldap:*:160:
- hast:*:845:
- nogroup:*:65533:
- nobody:*:65534:
- -bbsadmin-l:*:1001:
- -_tss:*:601:
- -messagebus:*:556:
- -avahi:*:558:
- -cups:*:193:
- -git_daemon:*:964:
- -polkitd:*:565:
- -polkit:*:562:
- -haldaemon:*:560:
- -grahamperrin:*:1004:
- -colord:*:970:
- -sddm:*:217:
- -webcamd:*:145:grahamperrin
- -vboxusers:*:920:grahamperrin,bbsadmin-l
- -pulse:*:563:
- -pulse-access:*:564:
- -pulse-rt:*:557:
- -cyrus:*:60:
- -mysql:*:88:
- -saned:*:194:
- -transmission:*:921:
- -gdm:*:92:
- -clamav:*:106:
- -nagios:*:181:www
- -ntpd:*:123:
- 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] ^C
- # exit
- root@momh167-gjp4-hpelitebook8570p-freebsd:~ #
Add Comment
Please, Sign In to add comment