aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--README13
-rw-r--r--examples/master_20180206-master_20180415.log261
-rw-r--r--examples/release_4.8.0-release_5.0.2.log292
-rw-r--r--examples/release_5.0.2-master_20180310.log442
4 files changed, 0 insertions, 1008 deletions
diff --git a/README b/README
index aefaddc..95df901 100644
--- a/README
+++ b/README
@@ -79,19 +79,6 @@ Versions
* 0.1.2 (2018-03-11)
- First usable version for broader testing
-Tests
------
-* 4.8.0-RELEASE -> 5.0.2-RELEASE
-* 5.0.0-RELEASE -> 5.0.2-RELEASE
-* 5.0.2-RELEASE -> 5.1.0.1010.gf2063-DEVELOPMENT
- (set "UPDATE_BRANCH=master")
-* 5.1.0.884.g8095c-DEVELOPMENT -> v5.3.0.110.g8296de-DEVELOPMENT
-
-Examples
---------
-Example output for updating DragonFly BSD using this tool can be found
-in the "examples" directory.
-
TODO
----
* Merge new users/groups
diff --git a/examples/master_20180206-master_20180415.log b/examples/master_20180206-master_20180415.log
deleted file mode 100644
index 55a710f..0000000
--- a/examples/master_20180206-master_20180415.log
+++ /dev/null
@@ -1,261 +0,0 @@
-#
-# Example output for updating DragonFly BSD from master on 20180206 to the latest master
-# 2018-04-16
-#
-
-vultr# ./dfly-update fly
-Checking status ...
-Fetch remote systems checksum: https://mirror-master.dragonflybsd.org/snapshots/x86_64/images/CHECKSUM.MD5
-Local installed system:
- branch: DEVELOPMENT
- version: 5.1.0.884.g8095c
-
-Remote available system:
- branch: DEVELOPMENT
- version: v5.3.0.110.g8296de
- filename: DragonFly-x86_64-20180415-DEV-v5.3.0.110.g8296de.img.bz2
- md5: d2b5f612c8568d8cce6078d1294e7875
-
-!!! Your DragonFly needs update !!!
-
-Downloading the new system image ...
- <= https://mirror-master.dragonflybsd.org/snapshots/x86_64/images/DragonFly-x86_64-20180415-DEV-v5.3.0.110.g8296de.img.bz2
- => /var/tmp/dfly-update/DragonFly-x86_64-20180415-DEV-v5.3.0.110.g8296de.img.bz2
-DONE
-MD5 checking file ... OK
-Decompressing file: /var/tmp/dfly-update/DragonFly-x86_64-20180415-DEV-v5.3.0.110.g8296de.img.bz2 ... DONE
-Mounting image /var/tmp/dfly-update/DragonFly-x86_64-20180415-DEV-v5.3.0.110.g8296de.img to /mnt/dfly-update ...
-/dev/vn0: /var/tmp/dfly-update/DragonFly-x86_64-20180415-DEV-v5.3.0.110.g8296de.img, complete file mapped
-DONE
-Backing up current kernel to /boot/kernel.old ...
-DONE
-Backing up current world to /var/backups/dfly-update/world.tar.gz ...
-DONE
-Installing the new kernel and world ...
- => Backing up the files to protect from overriding ...
- * /boot/loader.conf <backed>
- * /etc/fstab <backed>
- * /etc/group <backed>
- * /etc/localtime <backed>
- * /etc/master.passwd <backed>
- * /etc/passwd <backed>
- * /etc/pwd.db <backed>
- * /etc/rc.conf <backed>
- * /etc/spwd.db <backed>
- => Creating distribution directories ...
-./net/dummynet3 missing (created)
-./net/ipfw3 missing (created)
-./net/ipfw3_basic missing (created)
-./net/ipfw3_layer2 missing (created)
-./net/ipfw3_layer4 missing (created)
-./net/ipfw3_nat missing (created)
- => Installing kernel and world ...
- * Installing: COPYRIGHT ... ok
- * Installing: bin ... ok
- * Installing: boot ... ok
- * Installing: compat ... ok
- * Installing: lib ... ok
- * Installing: libexec ... ok
- * Installing: sbin ... ok
- * Installing: usr/Makefile ... ok
- * Installing: usr/bin ... ok
- * Installing: usr/games ... ok
- * Installing: usr/include ... ok
- * Installing: usr/lib ... ok
- * Installing: usr/libdata ... ok
- * Installing: usr/libexec ... ok
- * Installing: usr/sbin ... ok
- * Installing: usr/share ... ok
- * Installing: var/msgs ... ok
- * Installing: var/yp ... ok
- => Recovering the backed files ...
- * /boot/loader.conf <recovered>
- * /etc/fstab <recovered>
- * /etc/group <recovered>
- * /etc/localtime <recovered>
- * /etc/master.passwd <recovered>
- * /etc/passwd <recovered>
- * /etc/pwd.db <recovered>
- * /etc/rc.conf <recovered>
- * /etc/spwd.db <recovered>
- => DONE!
-Upgrading system ...
- => Coping new /etc to: /var/tmp/dfly-update/etc.new
- => Removing ignored files ...
- * /var/tmp/dfly-update/etc.new/group <ignored>
- * /var/tmp/dfly-update/etc.new/master.passwd <ignored>
- * /var/tmp/dfly-update/etc.new/passwd <ignored>
- * /var/tmp/dfly-update/etc.new/pwd.db <ignored>
- * /var/tmp/dfly-update/etc.new/rc.conf <ignored>
- * /var/tmp/dfly-update/etc.new/spwd.db <ignored>
- => Identifying new/updated config files ...
- * /var/tmp/dfly-update/etc.new/autofs/special_media [UPDATED]
- * /var/tmp/dfly-update/etc.new/csh.cshrc [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/mkinitrd.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/periodic.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/rc.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/devd/usb.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/locate.rc [UPDATED]
- * /var/tmp/dfly-update/etc.new/mail/aliases [UPDATED]
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf.postfix [UPDATED]
- * /var/tmp/dfly-update/etc.new/motd [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.include.dist [UPDATED]
- * /var/tmp/dfly-update/etc.new/newsyslog.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/100.clean-disks [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/110.clean-tmps [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/120.clean-preserve [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/130.clean-msgs [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/140.clean-rwho [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/150.clean-hoststat [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/160.clean-hammer [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/161.clean-hammer2 [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/200.backup-passwd [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/210.backup-aliases [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/300.calendar [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/310.accounting [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/330.news [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/400.status-disks [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/420.status-network [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/430.status-uptime [NEW]
- * /var/tmp/dfly-update/etc.new/periodic/daily/440.status-mailq [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/450.status-security [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/460.status-mail-rejects [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/500.queuerun [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/999.local [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/monthly/200.accounting [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/monthly/450.status-security [NEW]
- * /var/tmp/dfly-update/etc.new/periodic/monthly/999.local [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/100.chksetuid [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/110.neggrpperm [NEW]
- * /var/tmp/dfly-update/etc.new/periodic/security/200.chkmounts [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/300.chkuid0 [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/400.passwdless [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/410.logincheck [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/500.ipfwdenied [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/520.pfdenied [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/550.ipfwlimit [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/600.ip6fwdenied [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/650.ip6fwlimit [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/700.kernelmsg [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/800.loginfail [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/900.tcpwrap [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/security/security.functions [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/weekly/310.locate [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/weekly/320.whatis [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/weekly/340.noid [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/weekly/450.status-security [NEW]
- * /var/tmp/dfly-update/etc.new/periodic/weekly/999.local [UPDATED]
- * /var/tmp/dfly-update/etc.new/pf.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/accounting [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/btconfig [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/bthcid [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/cryptdisks [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/ipfw3 [NEW]
- * /var/tmp/dfly-update/etc.new/rc.d/lvm [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/sdpd [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.resume [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.subr [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.suspend [UPDATED]
- * /var/tmp/dfly-update/etc.new/shells [UPDATED]
- * /var/tmp/dfly-update/etc.new/ssh/sshd_config [UPDATED]
- * /var/tmp/dfly-update/etc.new/sysctl.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/syslog.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/upgrade/Makefile_upgrade.inc [UPDATED]
- => Installing new configurations ...
- => DONE!
-+---------+
-| WARNING | Files with '__new__' suffix need manual merge!
-+---------+
-Removing obsolete and deprecated files ...
- * /boot/efiboot.img
- * /usr/sbin/dfuibe_installer
- * /usr/sbin/dfuife_curses
- * /usr/sbin/installer
- * /usr/share/installer/cmdnames.conf
- * /usr/share/installer/fred.txt
- * /usr/share/installer/sources.conf
- * /usr/share/man/man8/installer.8.gz
-DONE
-Umounting image from /mnt/dfly-update ... DONE
-Disable and unconfigure VN device vn0 ...
-/dev/vn0: cleared
-DONE
-Removed image file: /build/var.tmp/dfly-update/DragonFly-x86_64-20180415-DEV-v5.3.0.110.g8296de.img
-+=========================================================+
-The following config files need manual merge:
-+---------------------------------------------------------+
-/etc/autofs/special_media.__new__
-/etc/csh.cshrc.__new__
-/etc/defaults/mkinitrd.conf.__new__
-/etc/defaults/periodic.conf.__new__
-/etc/defaults/rc.conf.__new__
-/etc/devd/usb.conf.__new__
-/etc/locate.rc.__new__
-/etc/mail/aliases.__new__
-/etc/mail/mailer.conf.__new__
-/etc/mail/mailer.conf.postfix.__new__
-/etc/motd.__new__
-/etc/mtree/BSD.include.dist.__new__
-/etc/newsyslog.conf.__new__
-/etc/periodic/daily/100.clean-disks.__new__
-/etc/periodic/daily/110.clean-tmps.__new__
-/etc/periodic/daily/120.clean-preserve.__new__
-/etc/periodic/daily/130.clean-msgs.__new__
-/etc/periodic/daily/140.clean-rwho.__new__
-/etc/periodic/daily/150.clean-hoststat.__new__
-/etc/periodic/daily/160.clean-hammer.__new__
-/etc/periodic/daily/161.clean-hammer2.__new__
-/etc/periodic/daily/200.backup-passwd.__new__
-/etc/periodic/daily/210.backup-aliases.__new__
-/etc/periodic/daily/300.calendar.__new__
-/etc/periodic/daily/310.accounting.__new__
-/etc/periodic/daily/330.news.__new__
-/etc/periodic/daily/400.status-disks.__new__
-/etc/periodic/daily/420.status-network.__new__
-/etc/periodic/daily/440.status-mailq.__new__
-/etc/periodic/daily/450.status-security.__new__
-/etc/periodic/daily/460.status-mail-rejects.__new__
-/etc/periodic/daily/500.queuerun.__new__
-/etc/periodic/daily/999.local.__new__
-/etc/periodic/monthly/200.accounting.__new__
-/etc/periodic/monthly/999.local.__new__
-/etc/periodic/security/100.chksetuid.__new__
-/etc/periodic/security/200.chkmounts.__new__
-/etc/periodic/security/300.chkuid0.__new__
-/etc/periodic/security/400.passwdless.__new__
-/etc/periodic/security/410.logincheck.__new__
-/etc/periodic/security/500.ipfwdenied.__new__
-/etc/periodic/security/520.pfdenied.__new__
-/etc/periodic/security/550.ipfwlimit.__new__
-/etc/periodic/security/600.ip6fwdenied.__new__
-/etc/periodic/security/650.ip6fwlimit.__new__
-/etc/periodic/security/700.kernelmsg.__new__
-/etc/periodic/security/800.loginfail.__new__
-/etc/periodic/security/900.tcpwrap.__new__
-/etc/periodic/security/security.functions.__new__
-/etc/periodic/weekly/310.locate.__new__
-/etc/periodic/weekly/320.whatis.__new__
-/etc/periodic/weekly/340.noid.__new__
-/etc/periodic/weekly/999.local.__new__
-/etc/pf.conf.__new__
-/etc/rc.d/accounting.__new__
-/etc/rc.d/btconfig.__new__
-/etc/rc.d/bthcid.__new__
-/etc/rc.d/cryptdisks.__new__
-/etc/rc.d/lvm.__new__
-/etc/rc.d/sdpd.__new__
-/etc/rc.resume.__new__
-/etc/rc.subr.__new__
-/etc/rc.suspend.__new__
-/etc/shells.__new__
-/etc/ssh/sshd_config.__new__
-/etc/sysctl.conf.__new__
-/etc/syslog.conf.__new__
-/etc/upgrade/Makefile_upgrade.inc.__new__
-+---------------------------------------------------------+
-After manually merge the above files, reboot into the new
-system, and upgrade the packages with:
- # pkg upgrade -f
-+=========================================================+
-
diff --git a/examples/release_4.8.0-release_5.0.2.log b/examples/release_4.8.0-release_5.0.2.log
deleted file mode 100644
index 9c730fb..0000000
--- a/examples/release_4.8.0-release_5.0.2.log
+++ /dev/null
@@ -1,292 +0,0 @@
-#
-# Example output for updating DragonFly BSD from 4.8.0-RELEASE to 5.0.2-RELEASE
-# 2018-03-20
-#
-
-dfly# ./dfly-update fly
-Checking status ...
-Fetch remote systems checksum: https://mirror-master.dragonflybsd.org/iso-images/md5.txt
-Local installed system:
- branch: RELEASE
- version: 4.8.0
-
-Remote available system:
- branch: RELEASE
- version: 5.0.2
- filename: dfly-x86_64-5.0.2_REL.img.bz2
- md5: a02acae53865c80c44159dd49790298b
-
-!!! Your DragonFly needs update !!!
-
-Downloading the new system image ...
- <= https://mirror-master.dragonflybsd.org/iso-images/dfly-x86_64-5.0.2_REL.img.bz2
- => /var/tmp/dfly-update/dfly-x86_64-5.0.2_REL.img.bz2
-/var/tmp/dfly-update/dfly-x86_64-5.0.2_REL.img100% of 268 MB 1599 kBps 02m52s
-DONE
-MD5 checking file ... OK
-Decompressing file: /var/tmp/dfly-update/dfly-x86_64-5.0.2_REL.img.bz2 ... DONE
-Mounting image /var/tmp/dfly-update/dfly-x86_64-5.0.2_REL.img to /mnt/dfly-update ...
-/dev/vn0: /var/tmp/dfly-update/dfly-x86_64-5.0.2_REL.img, complete file mapped
-DONE
-Backing up current kernel to /boot/kernel.old ...
-DONE
-Backing up current world to /var/backups/dfly-update/world.tar.gz ...
-DONE
-Installing the new kernel and world ...
- => Backing up the files to protect from overriding ...
- * /boot/loader.conf <backed>
- * /etc/crypttab <backed>
- * /etc/fstab <backed>
- * /etc/group <backed>
- * /etc/localtime <backed>
- * /etc/master.passwd <backed>
- * /etc/passwd <backed>
- * /etc/pwd.db <backed>
- * /etc/rc.conf <backed>
- * /etc/spwd.db <backed>
- => Creating distribution directories ...
-proc changed
- permissions expected 0555 found 0755 modified
-share/me changed
- user expected 0 found 9 modified
-share/nls changed
- user expected 0 found 9 modified
-share/nls/el_GR.ISO8859-7 changed
- user expected 0 found 9 modified
-share/nls/it_CH.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/ko_KR.eucKR changed
- user expected 0 found 9 modified
-share/nls/be_BY.UTF-8 changed
- user expected 0 found 9 modified
-share/nls/de_AT.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/es_ES.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/uk_UA.UTF-8 changed
- user expected 0 found 9 modified
-share/nls/de_DE.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/fr_BE.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/et_EE.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/de_CH.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/it_IT.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/fr_CH.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/fi_FI.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/fr_FR.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/zh_Hans_CN.UTF-8 changed
- user expected 0 found 9 modified
-share/nls/fr_CA.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/en_US.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/uk_UA.KOI8-U changed
- user expected 0 found 9 modified
-share/nls/C changed
- user expected 0 found 9 modified
-share/nls/ko_KR.UTF-8 changed
- user expected 0 found 9 modified
-share/nls/pt_BR.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/de_AT.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/ru_RU.KOI8-R changed
- user expected 0 found 9 modified
-share/nls/pl_PL.ISO8859-2 changed
- user expected 0 found 9 modified
-share/nls/hu_HU.ISO8859-2 changed
- user expected 0 found 9 modified
-share/nls/mn_Cyrl_MN.UTF-8 changed
- user expected 0 found 9 modified
-share/nls/nl_NL.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/es_ES.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/ja_JP.UTF-8 changed
- user expected 0 found 9 modified
-share/nls/pt_PT.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/de_DE.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/fr_BE.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/it_CH.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/sv_SE.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/zh_Hans_CN.GB2312 changed
- user expected 0 found 9 modified
-share/nls/de_CH.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/nb_NO.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/ja_JP.eucJP changed
- user expected 0 found 9 modified
-share/nls/zh_Hans_CN.GB18030 changed
- user expected 0 found 9 modified
-share/nls/fr_CA.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/en_US.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/sk_SK.ISO8859-2 changed
- user expected 0 found 9 modified
-share/nls/gl_ES.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/ca_ES.ISO8859-1 changed
- user expected 0 found 9 modified
-share/nls/it_IT.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/fr_CH.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/fi_FI.ISO8859-15 changed
- user expected 0 found 9 modified
-share/nls/fr_FR.ISO8859-15 changed
- user expected 0 found 9 modified
-share/mk changed
- user expected 0 found 9 modified
-share/man/man9 changed
- user expected 0 found 9 modified
-share/man/man1 changed
- user expected 0 found 9 modified
-share/man/man5 changed
- user expected 0 found 9 modified
-share/man/man2 changed
- user expected 0 found 9 modified
-share/man/man6 changed
- user expected 0 found 9 modified
-share/man/man7 changed
- user expected 0 found 9 modified
-share/man/man3 changed
- user expected 0 found 9 modified
-share/man/man8 changed
- user expected 0 found 9 modified
-share/man/man4 changed
- user expected 0 found 9 modified
-share/openssl changed
- user expected 0 found 9 modified
-share/openssl/man changed
- user expected 0 found 9 modified
-share/misc changed
- user expected 0 found 9 modified
-./vfs/tmpfs missing (created)
- => Installing kernel and world ...
- * Installing: COPYRIGHT ... ok
- * Installing: bin ... ok
- * Installing: boot ... ok
- * Installing: compat ... ok
- * Installing: lib ... ok
- * Installing: libexec ... ok
- * Installing: sbin ... ok
- * Installing: usr/Makefile ... ok
- * Installing: usr/bin ... ok
- * Installing: usr/games ... ok
- * Installing: usr/include ... ok
- * Installing: usr/lib ... ok
- * Installing: usr/libdata ... ok
- * Installing: usr/libexec ... ok
- * Installing: usr/sbin ... ok
- * Installing: usr/share ... ok
- * Installing: var/msgs ... ok
- * Installing: var/yp ... ok
- => Recovering the backed files ...
- * /boot/loader.conf <recovered>
- * /etc/crypttab <recovered>
- * /etc/fstab <recovered>
- * /etc/group <recovered>
- * /etc/localtime <recovered>
- * /etc/master.passwd <recovered>
- * /etc/passwd <recovered>
- * /etc/pwd.db <recovered>
- * /etc/rc.conf <recovered>
- * /etc/spwd.db <recovered>
- => DONE!
-Upgrading system ...
- => Coping new /etc to: /var/tmp/dfly-update/etc.new
- => Removing ignored files ...
- * /var/tmp/dfly-update/etc.new/group <ignored>
- * /var/tmp/dfly-update/etc.new/master.passwd <ignored>
- * /var/tmp/dfly-update/etc.new/passwd <ignored>
- * /var/tmp/dfly-update/etc.new/pwd.db <ignored>
- * /var/tmp/dfly-update/etc.new/rc.conf <ignored>
- * /var/tmp/dfly-update/etc.new/spwd.db <ignored>
- => Identifying new/updated config files ...
- * /var/tmp/dfly-update/etc.new/csh.logout [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/mkinitrd.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/periodic.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/hosts [UPDATED]
- * /var/tmp/dfly-update/etc.new/inetd.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/mail/aliases [UPDATED]
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/motd [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.include.dist [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.root.dist [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.usr.dist [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.var.dist [UPDATED]
- * /var/tmp/dfly-update/etc.new/newsyslog.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/periodic/daily/161.clean-hammer2 [NEW]
- * /var/tmp/dfly-update/etc.new/pf.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/shells [UPDATED]
- * /var/tmp/dfly-update/etc.new/ssh/moduli [UPDATED]
- * /var/tmp/dfly-update/etc.new/ssh/ssh_config [UPDATED]
- * /var/tmp/dfly-update/etc.new/ssh/sshd_config [UPDATED]
- * /var/tmp/dfly-update/etc.new/sysctl.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/syslog.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/upgrade/Makefile_upgrade.inc [UPDATED]
- => Installing new configurations ...
- => DONE!
-+---------+
-| WARNING | Files with '__new__' suffix need manual merge!
-+---------+
-Removing obsolete and deprecated files ...
-Removing obsolete and deprecated files ...
- * /usr/share/man/man3/archive.3.gz
- * /usr/sbin/dfuibe_installer
- * /usr/sbin/dfuife_curses
- * /usr/sbin/installer
- * /usr/share/installer/cmdnames.conf
- * /usr/share/installer/fred.txt
- * /usr/share/installer/sources.conf
- * /usr/share/man/man8/installer.8.gz
-DONE
-Umounting image from /mnt/dfly-update ... DONE
-Disable and unconfigure VN device vn0 ...
-/dev/vn0: cleared
-DONE
-Removed image file: /pfs/@@-1:00007/dfly-update/dfly-x86_64-5.0.2_REL.img
-+=========================================================+
-The following config files need manual merge:
-+---------------------------------------------------------+
-/etc/csh.logout.__new__
-/etc/defaults/mkinitrd.conf.__new__
-/etc/defaults/periodic.conf.__new__
-/etc/hosts.__new__
-/etc/inetd.conf.__new__
-/etc/mail/aliases.__new__
-/etc/mail/mailer.conf.__new__
-/etc/motd.__new__
-/etc/mtree/BSD.include.dist.__new__
-/etc/mtree/BSD.root.dist.__new__
-/etc/mtree/BSD.usr.dist.__new__
-/etc/mtree/BSD.var.dist.__new__
-/etc/newsyslog.conf.__new__
-/etc/pf.conf.__new__
-/etc/shells.__new__
-/etc/ssh/moduli.__new__
-/etc/ssh/ssh_config.__new__
-/etc/ssh/sshd_config.__new__
-/etc/sysctl.conf.__new__
-/etc/syslog.conf.__new__
-/etc/upgrade/Makefile_upgrade.inc.__new__
-+---------------------------------------------------------+
-Upgrade the packages by:
- # pkg upgrade -f
-+=========================================================+
-
-dfly#
diff --git a/examples/release_5.0.2-master_20180310.log b/examples/release_5.0.2-master_20180310.log
deleted file mode 100644
index 92f7940..0000000
--- a/examples/release_5.0.2-master_20180310.log
+++ /dev/null
@@ -1,442 +0,0 @@
-#
-# Example output for updating DragonFly BSD from 5.0.2-RELEASE to the latest master
-# 2018-03-11
-#
-
-dfly# uname -a
-DragonFly dfly.aaronly.me 5.0-RELEASE DragonFly v5.0.2-RELEASE #4: Sun Dec 3 17:42:25 EST 2017 root@www.shiningsilence.com:/usr/obj/home/justin/release/5_0/sys/X86_64_GENERIC x86_64
-
-dfly# ./dfly-update fly
-Checking status ...
-Fetch remote systems checksum: https://mirror-master.dragonflybsd.org/snapshots/x86_64/images/CHECKSUM.MD5
-Local installed system:
- branch: RELEASE
- version: 5.0.2
-
-Remote available system:
- branch: master
- version: v5.1.0.1010.gf2063
- filename: DragonFly-x86_64-20180310-DEV-v5.1.0.1010.gf2063.img.bz2
- md5: cacfee6357e273433338e883bfd39e9f
-
-!!! Your DragonFly needs update !!!
-Downloading the new system image ...
- <= https://mirror-master.dragonflybsd.org/snapshots/x86_64/images/DragonFly-x86_64-20180310-DEV-v5.1.0.1010.gf2063.img.bz2
- => /var/tmp/dfly-update/DragonFly-x86_64-20180310-DEV-v5.1.0.1010.gf2063.img.bz2
-/var/tmp/dfly-update/DragonFly-x86_64-20180310100% of 290 MB 170 kBps 29m03s
-DONE
-MD5 checking file ... OK
-Decompressing file: /var/tmp/dfly-update/DragonFly-x86_64-20180310-DEV-v5.1.0.1010.gf2063.img.bz2 ... DONE
-Mounting image /var/tmp/dfly-update/DragonFly-x86_64-20180310-DEV-v5.1.0.1010.gf2063.img to /mnt/dfly-update ...
-/dev/vn0: /var/tmp/dfly-update/DragonFly-x86_64-20180310-DEV-v5.1.0.1010.gf2063.img, complete file mapped
-DONE
-Backing up current kernel to /boot/kernel.old ...
-WARNING: Previously backed kernel already exists!
-WARNING: Removed previously backed kernel: /boot/kernel.old
-DONE
-Backing up current world to /var/backups/dfly-update/world.tar.gz ...
-WARNING: Previously backed world exists!
-WARNING: Removed previously backed world: /var/backups/dfly-update/world.tar.gz
-DONE
-Installing the new kernel and world ...
- => Backing up the files to protect from overriding ...
- * /boot/loader.conf <backed>
- * /etc/fstab <backed>
- * /etc/group <backed>
- * /etc/localtime <backed>
- * /etc/master.passwd <backed>
- * /etc/passwd <backed>
- * /etc/pwd.db <backed>
- * /etc/rc.conf <backed>
- * /etc/spwd.db <backed>
- => Creating distribution directories ...
-./share/calendar/de_AT.ISO8859-15 missing (created)
-./share/games/boggle missing (created)
-./share/locale/is_IS.ISO8859-1 missing (created)
-./dev/misc/evdev missing (created)
- => Installing kernel and world ...
- * Installing: COPYRIGHT ... ok
- * Installing: bin ... ok
- * Installing: boot ... ok
- * Installing: compat ... ok
- * Installing: lib ... ok
- * Installing: libexec ... ok
- * Installing: sbin ... ok
- * Installing: usr/Makefile ... ok
- * Installing: usr/bin ... ok
- * Installing: usr/games ... ok
- * Installing: usr/include ... ok
- * Installing: usr/lib ... ok
- * Installing: usr/libdata ... ok
- * Installing: usr/libexec ... ok
- * Installing: usr/sbin ... ok
- * Installing: usr/share ... ok
- * Installing: var/msgs ... ok
- * Installing: var/yp ... ok
- => Recovering the backed files ...
- * /boot/loader.conf <recovered>
- * /etc/fstab <recovered>
- * /etc/group <recovered>
- * /etc/localtime <recovered>
- * /etc/master.passwd <recovered>
- * /etc/passwd <recovered>
- * /etc/pwd.db <recovered>
- * /etc/rc.conf <recovered>
- * /etc/spwd.db <recovered>
- => DONE!
-Upgrading system ...
- => Coping new /etc to: /var/tmp/dfly-update/etc.new
- => Removing ignored files ...
- * /var/tmp/dfly-update/etc.new/group <ignored>
- * /var/tmp/dfly-update/etc.new/master.passwd <ignored>
- * /var/tmp/dfly-update/etc.new/passwd <ignored>
- * /var/tmp/dfly-update/etc.new/pwd.db <ignored>
- * /var/tmp/dfly-update/etc.new/rc.conf <ignored>
- * /var/tmp/dfly-update/etc.new/spwd.db <ignored>
- => Identifying new config files for installing/merging ...
- * /var/tmp/dfly-update/etc.new/auth.conf (same)
- * /var/tmp/dfly-update/etc.new/auto_master [UPDATED]
- * /var/tmp/dfly-update/etc.new/autofs/include_ldap (same)
- * /var/tmp/dfly-update/etc.new/autofs/include_nis [NEW]
- * /var/tmp/dfly-update/etc.new/autofs/include_nis_nullfs [NEW]
- * /var/tmp/dfly-update/etc.new/autofs/special_hosts (same)
- * /var/tmp/dfly-update/etc.new/autofs/special_media [UPDATED]
- * /var/tmp/dfly-update/etc.new/autofs/special_noauto [UPDATED]
- * /var/tmp/dfly-update/etc.new/autofs/special_null (same)
- * /var/tmp/dfly-update/etc.new/bluetooth/bthcid.conf (same)
- * /var/tmp/dfly-update/etc.new/bluetooth/hosts (same)
- * /var/tmp/dfly-update/etc.new/bluetooth/protocols (same)
- * /var/tmp/dfly-update/etc.new/crontab (same)
- * /var/tmp/dfly-update/etc.new/csh.cshrc (same)
- * /var/tmp/dfly-update/etc.new/csh.login (same)
- * /var/tmp/dfly-update/etc.new/csh.logout (same)
- * /var/tmp/dfly-update/etc.new/defaults/compilers.conf (same)
- * /var/tmp/dfly-update/etc.new/defaults/devfs.conf (same)
- * /var/tmp/dfly-update/etc.new/defaults/make.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/mkinitrd.conf (same)
- * /var/tmp/dfly-update/etc.new/defaults/periodic.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/pfi.conf (same)
- * /var/tmp/dfly-update/etc.new/defaults/rc.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/defaults/uuids (same)
- * /var/tmp/dfly-update/etc.new/devd/asus.conf (same)
- * /var/tmp/dfly-update/etc.new/devd/uath.conf (same)
- * /var/tmp/dfly-update/etc.new/devd/usb.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/devd.conf (same)
- * /var/tmp/dfly-update/etc.new/devtab (same)
- * /var/tmp/dfly-update/etc.new/dhclient.conf (same)
- * /var/tmp/dfly-update/etc.new/disktab (same)
- * /var/tmp/dfly-update/etc.new/dma/auth.conf.sample (same)
- * /var/tmp/dfly-update/etc.new/dma/dma.conf.sample (same)
- * /var/tmp/dfly-update/etc.new/dntpd.conf (same)
- * /var/tmp/dfly-update/etc.new/dumpdates (same)
- * /var/tmp/dfly-update/etc.new/fbtab (same)
- * /var/tmp/dfly-update/etc.new/ftpusers (same)
- * /var/tmp/dfly-update/etc.new/gettytab [UPDATED]
- * /var/tmp/dfly-update/etc.new/hosts (same)
- * /var/tmp/dfly-update/etc.new/hosts.allow (same)
- * /var/tmp/dfly-update/etc.new/hosts.equiv (same)
- * /var/tmp/dfly-update/etc.new/hosts.lpd (same)
- * /var/tmp/dfly-update/etc.new/inetd.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/locate.rc [UPDATED]
- * /var/tmp/dfly-update/etc.new/login.access (same)
- * /var/tmp/dfly-update/etc.new/login.conf (same)
- * /var/tmp/dfly-update/etc.new/login.conf.db (same)
- * /var/tmp/dfly-update/etc.new/mail/Makefile (same)
- * /var/tmp/dfly-update/etc.new/mail/README (same)
- * /var/tmp/dfly-update/etc.new/mail/access.sample (same)
- * /var/tmp/dfly-update/etc.new/mail/aliases (same)
- * /var/tmp/dfly-update/etc.new/mail/dragonfly.mc (same)
- * /var/tmp/dfly-update/etc.new/mail/dragonfly.submit.mc (same)
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf (same)
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf.dma (same)
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf.opensmtpd (same)
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf.postfix (same)
- * /var/tmp/dfly-update/etc.new/mail/mailer.conf.sendmail (same)
- * /var/tmp/dfly-update/etc.new/mail/mailertable.sample (same)
- * /var/tmp/dfly-update/etc.new/mail/virtusertable.sample (same)
- * /var/tmp/dfly-update/etc.new/mail.rc (same)
- * /var/tmp/dfly-update/etc.new/manpath.config (same)
- * /var/tmp/dfly-update/etc.new/modems (same)
- * /var/tmp/dfly-update/etc.new/motd [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.include.dist [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.local.dist (same)
- * /var/tmp/dfly-update/etc.new/mtree/BSD.root.dist (same)
- * /var/tmp/dfly-update/etc.new/mtree/BSD.usr.dist [UPDATED]
- * /var/tmp/dfly-update/etc.new/mtree/BSD.var.dist (same)
- * /var/tmp/dfly-update/etc.new/netconfig (same)
- * /var/tmp/dfly-update/etc.new/network.subr [UPDATED]
- * /var/tmp/dfly-update/etc.new/networks (same)
- * /var/tmp/dfly-update/etc.new/newsyslog.conf [UPDATED]
- * /var/tmp/dfly-update/etc.new/nscd.conf (same)
- * /var/tmp/dfly-update/etc.new/nsmb.conf (same)
- * /var/tmp/dfly-update/etc.new/opieaccess (same)
- * /var/tmp/dfly-update/etc.new/pam.d/README (same)
- * /var/tmp/dfly-update/etc.new/pam.d/atrun (same)
- * /var/tmp/dfly-update/etc.new/pam.d/convert.sh (same)
- * /var/tmp/dfly-update/etc.new/pam.d/cron (same)
- * /var/tmp/dfly-update/etc.new/pam.d/ftp (same)
- * /var/tmp/dfly-update/etc.new/pam.d/ftpd (same)
- * /var/tmp/dfly-update/etc.new/pam.d/imap (same)
- * /var/tmp/dfly-update/etc.new/pam.d/login (same)
- * /var/tmp/dfly-update/etc.new/pam.d/other (same)
- * /var/tmp/dfly-update/etc.new/pam.d/passwd (same)
- * /var/tmp/dfly-update/etc.new/pam.d/pop3 (same)
- * /var/tmp/dfly-update/etc.new/pam.d/rsh (same)
- * /var/tmp/dfly-update/etc.new/pam.d/sshd (same)
- * /var/tmp/dfly-update/etc.new/pam.d/su (same)
- * /var/tmp/dfly-update/etc.new/pam.d/system (same)
- * /var/tmp/dfly-update/etc.new/pam.d/telnetd (same)
- * /var/tmp/dfly-update/etc.new/pam.d/xdm (same)
- * /var/tmp/dfly-update/etc.new/pccard_ether (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/100.clean-disks (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/110.clean-tmps (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/120.clean-preserve (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/130.clean-msgs (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/140.clean-rwho (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/150.clean-hoststat (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/160.clean-hammer (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/161.clean-hammer2 (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/200.backup-passwd (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/210.backup-aliases (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/300.calendar (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/310.accounting (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/330.news (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/400.status-disks (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/420.status-network (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/430.status-rwho (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/440.status-mailq (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/450.status-security (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/460.status-mail-rejects (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/470.status-named (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/500.queuerun (same)
- * /var/tmp/dfly-update/etc.new/periodic/daily/999.local (same)
- * /var/tmp/dfly-update/etc.new/periodic/monthly/200.accounting (same)
- * /var/tmp/dfly-update/etc.new/periodic/monthly/300.statistics (same)
- * /var/tmp/dfly-update/etc.new/periodic/monthly/999.local (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/100.chksetuid (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/200.chkmounts (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/300.chkuid0 (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/400.passwdless (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/410.logincheck (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/500.ipfwdenied (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/520.pfdenied (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/550.ipfwlimit (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/600.ip6fwdenied (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/650.ip6fwlimit (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/700.kernelmsg (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/800.loginfail (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/900.tcpwrap (same)
- * /var/tmp/dfly-update/etc.new/periodic/security/security.functions (same)
- * /var/tmp/dfly-update/etc.new/periodic/weekly/120.clean-kvmdb (same)
- * /var/tmp/dfly-update/etc.new/periodic/weekly/310.locate (same)
- * /var/tmp/dfly-update/etc.new/periodic/weekly/320.whatis (same)
- * /var/tmp/dfly-update/etc.new/periodic/weekly/330.catman (same)
- * /var/tmp/dfly-update/etc.new/periodic/weekly/340.noid (same)
- * /var/tmp/dfly-update/etc.new/periodic/weekly/999.local (same)
- * /var/tmp/dfly-update/etc.new/pf.conf (same)
- * /var/tmp/dfly-update/etc.new/pf.os [UPDATED]
- * /var/tmp/dfly-update/etc.new/phones (same)
- * /var/tmp/dfly-update/etc.new/ppp/ppp.conf (same)
- * /var/tmp/dfly-update/etc.new/printcap (same)
- * /var/tmp/dfly-update/etc.new/profile (same)
- * /var/tmp/dfly-update/etc.new/protocols (same)
- * /var/tmp/dfly-update/etc.new/rc (same)
- * /var/tmp/dfly-update/etc.new/rc.d/DAEMON (same)
- * /var/tmp/dfly-update/etc.new/rc.d/LOGIN (same)
- * /var/tmp/dfly-update/etc.new/rc.d/NETWORKING [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/SERVERS (same)
- * /var/tmp/dfly-update/etc.new/rc.d/accounting (same)
- * /var/tmp/dfly-update/etc.new/rc.d/addswap (same)
- * /var/tmp/dfly-update/etc.new/rc.d/adjkerntz (same)
- * /var/tmp/dfly-update/etc.new/rc.d/automount (same)
- * /var/tmp/dfly-update/etc.new/rc.d/automountd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/autounmountd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/bootconf (same)
- * /var/tmp/dfly-update/etc.new/rc.d/bootparams (same)
- * /var/tmp/dfly-update/etc.new/rc.d/btconfig (same)
- * /var/tmp/dfly-update/etc.new/rc.d/bthcid (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ccd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/cleanvar (same)
- * /var/tmp/dfly-update/etc.new/rc.d/cleartmp (same)
- * /var/tmp/dfly-update/etc.new/rc.d/cron (same)
- * /var/tmp/dfly-update/etc.new/rc.d/cryptdisks (same)
- * /var/tmp/dfly-update/etc.new/rc.d/devd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/devfs (same)
- * /var/tmp/dfly-update/etc.new/rc.d/dhclient (same)
- * /var/tmp/dfly-update/etc.new/rc.d/diskless (same)
- * /var/tmp/dfly-update/etc.new/rc.d/dmesg (same)
- * /var/tmp/dfly-update/etc.new/rc.d/dntpd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/dumpon (same)
- * /var/tmp/dfly-update/etc.new/rc.d/fixbootfile (same)
- * /var/tmp/dfly-update/etc.new/rc.d/fsck (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ftpd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/hostname (same)
- * /var/tmp/dfly-update/etc.new/rc.d/hotplugd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/inetd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/initdiskless (same)
- * /var/tmp/dfly-update/etc.new/rc.d/initrandom (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ip6fw (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ipfw [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/ipsec (same)
- * /var/tmp/dfly-update/etc.new/rc.d/jail (same)
- * /var/tmp/dfly-update/etc.new/rc.d/keyserv (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ldconfig (same)
- * /var/tmp/dfly-update/etc.new/rc.d/local (same)
- * /var/tmp/dfly-update/etc.new/rc.d/localdaemons (same)
- * /var/tmp/dfly-update/etc.new/rc.d/lockd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/lpd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/lvm (same)
- * /var/tmp/dfly-update/etc.new/rc.d/mixer (same)
- * /var/tmp/dfly-update/etc.new/rc.d/modules (same)
- * /var/tmp/dfly-update/etc.new/rc.d/motd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/mountcritlocal (same)
- * /var/tmp/dfly-update/etc.new/rc.d/mountcritremote (same)
- * /var/tmp/dfly-update/etc.new/rc.d/mountd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/moused (same)
- * /var/tmp/dfly-update/etc.new/rc.d/mroute6d (same)
- * /var/tmp/dfly-update/etc.new/rc.d/mrouted (same)
- * /var/tmp/dfly-update/etc.new/rc.d/msgs (same)
- * /var/tmp/dfly-update/etc.new/rc.d/named (same)
- * /var/tmp/dfly-update/etc.new/rc.d/netif (same)
- * /var/tmp/dfly-update/etc.new/rc.d/netoptions (same)
- * /var/tmp/dfly-update/etc.new/rc.d/network_ipv6 [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/newsyslog (same)
- * /var/tmp/dfly-update/etc.new/rc.d/nfsclient (same)
- * /var/tmp/dfly-update/etc.new/rc.d/nfsd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/nfsserver (same)
- * /var/tmp/dfly-update/etc.new/rc.d/nisdomain (same)
- * /var/tmp/dfly-update/etc.new/rc.d/nscd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/nsswitch (same)
- * /var/tmp/dfly-update/etc.new/rc.d/othermta (same)
- * /var/tmp/dfly-update/etc.new/rc.d/pf (same)
- * /var/tmp/dfly-update/etc.new/rc.d/pflog (same)
- * /var/tmp/dfly-update/etc.new/rc.d/powerd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ppp [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/pppoed (same)
- * /var/tmp/dfly-update/etc.new/rc.d/pwcheck (same)
- * /var/tmp/dfly-update/etc.new/rc.d/quota (same)
- * /var/tmp/dfly-update/etc.new/rc.d/random (same)
- * /var/tmp/dfly-update/etc.new/rc.d/rarpd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/rcconf (same)
- * /var/tmp/dfly-update/etc.new/rc.d/resident (same)
- * /var/tmp/dfly-update/etc.new/rc.d/rndcontrol (same)
- * /var/tmp/dfly-update/etc.new/rc.d/root (same)
- * /var/tmp/dfly-update/etc.new/rc.d/route6d (same)
- * /var/tmp/dfly-update/etc.new/rc.d/routed (same)
- * /var/tmp/dfly-update/etc.new/rc.d/routing [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/rpcbind [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/rtadvd [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.d/rtsold (same)
- * /var/tmp/dfly-update/etc.new/rc.d/rwho (same)
- * /var/tmp/dfly-update/etc.new/rc.d/savecore (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sdpd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/securelevel (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sendmail (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sensorsd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/serial (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sppp (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sshd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/statd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/swap1 (same)
- * /var/tmp/dfly-update/etc.new/rc.d/syscons (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sysctl (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sysdb (same)
- * /var/tmp/dfly-update/etc.new/rc.d/syslogd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/sysvipcd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/timed (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ttys (same)
- * /var/tmp/dfly-update/etc.new/rc.d/udevd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/udevd_early (same)
- * /var/tmp/dfly-update/etc.new/rc.d/varsym (same)
- * /var/tmp/dfly-update/etc.new/rc.d/vfs_quota (same)
- * /var/tmp/dfly-update/etc.new/rc.d/vinum (same)
- * /var/tmp/dfly-update/etc.new/rc.d/virecover (same)
- * /var/tmp/dfly-update/etc.new/rc.d/vkernel (same)
- * /var/tmp/dfly-update/etc.new/rc.d/vknetd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/watchdogd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/wpa_supplicant (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ypbind (same)
- * /var/tmp/dfly-update/etc.new/rc.d/yppasswdd (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ypserv (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ypset (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ypupdated (same)
- * /var/tmp/dfly-update/etc.new/rc.d/ypxfrd (same)
- * /var/tmp/dfly-update/etc.new/rc.firewall (same)
- * /var/tmp/dfly-update/etc.new/rc.firewall6 (same)
- * /var/tmp/dfly-update/etc.new/rc.resume [UPDATED]
- * /var/tmp/dfly-update/etc.new/rc.sendmail (same)
- * /var/tmp/dfly-update/etc.new/rc.shutdown (same)
- * /var/tmp/dfly-update/etc.new/rc.subr (same)
- * /var/tmp/dfly-update/etc.new/rc.suspend [UPDATED]
- * /var/tmp/dfly-update/etc.new/regdomain.xml (same)
- * /var/tmp/dfly-update/etc.new/remote [UPDATED]
- * /var/tmp/dfly-update/etc.new/rpc (same)
- * /var/tmp/dfly-update/etc.new/sensorsd.conf (same)
- * /var/tmp/dfly-update/etc.new/services (same)
- * /var/tmp/dfly-update/etc.new/shells [UPDATED]
- * /var/tmp/dfly-update/etc.new/ssh/moduli (same)
- * /var/tmp/dfly-update/etc.new/ssh/ssh_config (same)
- * /var/tmp/dfly-update/etc.new/ssh/sshd_config [UPDATED]
- * /var/tmp/dfly-update/etc.new/ssl/openssl.cnf (same)
- * /var/tmp/dfly-update/etc.new/sysctl.conf (same)
- * /var/tmp/dfly-update/etc.new/syslog.conf (same)
- * /var/tmp/dfly-update/etc.new/ttys (same)
- * /var/tmp/dfly-update/etc.new/upgrade/Makefile_upgrade.inc [UPDATED]
- * /var/tmp/dfly-update/etc.new/wpa_supplicant.conf (same)
- => Coping new configurations over ...
- => DONE!
-+---------+
-| WARNING | Files with '__new__' suffix need manual merge!
-+---------+
-Removing obsolete and deprecated files ...
- * /usr/share/locale/is_IS.ISO8859-1
- * /usr/sbin/dfuibe_installer
- * /usr/sbin/dfuife_curses
- * /usr/sbin/installer
- * /usr/share/installer/cmdnames.conf
- * /usr/share/installer/fred.txt
- * /usr/share/installer/sources.conf
- * /usr/share/man/man8/installer.8.gz
-DONE
-Umounting image from /mnt/dfly-update ... DONE
-Disable and unconfigure VN device vn0 ...
-/dev/vn0: cleared
-DONE
-Removed image file: /build/var.tmp/dfly-update/DragonFly-x86_64-20180310-DEV-v5.1.0.1010.gf2063.img
-+=========================================================+
-The following config files need manual merge:
-+---------------------------------------------------------+
-/etc/auto_master.__new__
-/etc/autofs/special_media.__new__
-/etc/autofs/special_noauto.__new__
-/etc/defaults/make.conf.__new__
-/etc/defaults/periodic.conf.__new__
-/etc/defaults/rc.conf.__new__
-/etc/devd/usb.conf.__new__
-/etc/gettytab.__new__
-/etc/inetd.conf.__new__
-/etc/locate.rc.__new__
-/etc/motd.__new__
-/etc/mtree/BSD.include.dist.__new__
-/etc/mtree/BSD.usr.dist.__new__
-/etc/network.subr.__new__
-/etc/newsyslog.conf.__new__
-/etc/pf.os.__new__
-/etc/rc.d/NETWORKING.__new__
-/etc/rc.d/ipfw.__new__
-/etc/rc.d/network_ipv6.__new__
-/etc/rc.d/ppp.__new__
-/etc/rc.d/routing.__new__
-/etc/rc.d/rpcbind.__new__
-/etc/rc.d/rtadvd.__new__
-/etc/rc.resume.__new__
-/etc/rc.suspend.__new__
-/etc/remote.__new__
-/etc/shells.__new__
-/etc/ssh/sshd_config.__new__
-/etc/upgrade/Makefile_upgrade.inc.__new__
-+---------------------------------------------------------+
-Upgrade the packages by:
- # pkg upgrade -f
-+=========================================================+
-