From 326c1aa05a6d82266b064200509768bbc9a272c1 Mon Sep 17 00:00:00 2001 From: Aaron LI Date: Mon, 16 Apr 2018 19:15:21 +0800 Subject: Update README about v0.1.3 and add a new upgrade example --- README | 7 +- examples/master_20180206-master_20180415.log | 262 +++++++++++++++++++++++++++ 2 files changed, 268 insertions(+), 1 deletion(-) create mode 100644 examples/master_20180206-master_20180415.log diff --git a/README b/README index 8ccfa64..6ef081d 100644 --- a/README +++ b/README @@ -68,7 +68,11 @@ After this, you still need to merge the listed config files with suffix Versions -------- -* 0.1.2 (2018-03-11) First usable version for broader testing +* 0.1.3 (2018-04-16) + - Fix the issue that the old Makefile_upgrade been used + - Make the upgrade messages more concise +* 0.1.2 (2018-03-11) + - First usable version for broader testing Tests ----- @@ -76,6 +80,7 @@ Tests * 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 -------- diff --git a/examples/master_20180206-master_20180415.log b/examples/master_20180206-master_20180415.log new file mode 100644 index 0000000..54a84c0 --- /dev/null +++ b/examples/master_20180206-master_20180415.log @@ -0,0 +1,262 @@ +# +# 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 +/var/tmp/dfly-update/DragonFly-x86_64-20180415 0% of 292 MB 0 Bps/var/tmp/dfly-update/DragonFly-x86_64-20180415 0% of 292 MB 301 kBps/var/tmp/dfly-update/DragonFly-x86_64-20180415 0% of 292 MB 482 kBps/var/tmp/dfly-update/DragonFly-x86_64-20180415 0% of 292 MB 514 kBps 13m42s/var/tmp/dfly-update/DragonFly-x86_64-20180415 0% of 292 MB 631 kBps 11m41s/var/tmp/dfly-update/DragonFly-x86_64-20180415 0% of 292 MB 729 kBps 10m06s/var/tmp/dfly-update/DragonFly-x86_64-20180415 1% of 292 MB 810 kBps 09m09s/var/tmp/dfly-update/DragonFly-x86_64-20180415 1% of 292 MB 1010 kBps 08m03s/var/tmp/dfly-update/DragonFly-x86_64-20180415 1% of 292 MB 1172 kBps 07m14s/var/tmp/dfly-update/DragonFly-x86_64-20180415 2% of 292 MB 1304 kBps 06m29s/var/tmp/dfly-update/DragonFly-x86_64-20180415 2% of 292 MB 1466 kBps 05m56s/var/tmp/dfly-update/DragonFly-x86_64-20180415 3% of 292 MB 1817 kBps 05m16s/var/tmp/dfly-update/DragonFly-x86_64-20180415 4% of 292 MB 2033 kBps 04m46s/var/tmp/dfly-update/DragonFly-x86_64-20180415 4% of 292 MB 2417 kBps 04m14s/var/tmp/dfly-update/DragonFly-x86_64-20180415 5% of 292 MB 3198 kBps 03m42s/var/tmp/dfly-update/DragonFly-x86_64-20180415 6% of 292 MB 1600 kBps 03m38s/var/tmp/dfly-update/DragonFly-x86_64-20180415 7% of 292 MB 1915 kBps 03m29s/var/tmp/dfly-update/DragonFly-x86_64-20180415 7% of 292 MB 2257 kBps 03m20s/var/tmp/dfly-update/DragonFly-x86_64-20180415 8% of 292 MB 2593 kBps 03m08s/var/tmp/dfly-update/DragonFly-x86_64-20180415 9% of 292 MB 2949 kBps 02m57s/var/tmp/dfly-update/DragonFly-x86_64-20180415 10% of 292 MB 3193 kBps 02m45s/var/tmp/dfly-update/DragonFly-x86_64-20180415 11% of 292 MB 3467 kBps 02m35s/var/tmp/dfly-update/DragonFly-x86_64-20180415 13% of 292 MB 3726 kBps 02m25s/var/tmp/dfly-update/DragonFly-x86_64-20180415 14% of 292 MB 3443 kBps 02m17s/var/tmp/dfly-update/DragonFly-x86_64-20180415 15% of 292 MB 3545 kBps 02m10s/var/tmp/dfly-update/DragonFly-x86_64-20180415 16% of 292 MB 3391 kBps 02m05s/var/tmp/dfly-update/DragonFly-x86_64-20180415 17% of 292 MB 3578 kBps 02m00s/var/tmp/dfly-update/DragonFly-x86_64-20180415 18% of 292 MB 3498 kBps 01m55s/var/tmp/dfly-update/DragonFly-x86_64-20180415 20% of 292 MB 3794 kBps 01m50s/var/tmp/dfly-update/DragonFly-x86_64-20180415 21% of 292 MB 3471 kBps 01m46s/var/tmp/dfly-update/DragonFly-x86_64-20180415 22% of 292 MB 3745 kBps 01m42s/var/tmp/dfly-update/DragonFly-x86_64-20180415 23% of 292 MB 3613 kBps 01m38s/var/tmp/dfly-update/DragonFly-x86_64-20180415 25% of 292 MB 3620 kBps 01m35s/var/tmp/dfly-update/DragonFly-x86_64-20180415 26% of 292 MB 3635 kBps 01m32s/var/tmp/dfly-update/DragonFly-x86_64-20180415 27% of 292 MB 3527 kBps 01m29s/var/tmp/dfly-update/DragonFly-x86_64-20180415 28% of 292 MB 3669 kBps 01m27s/var/tmp/dfly-update/DragonFly-x86_64-20180415 29% of 292 MB 2461 kBps 01m26s/var/tmp/dfly-update/DragonFly-x86_64-20180415 30% of 292 MB 3316 kBps 01m23s/var/tmp/dfly-update/DragonFly-x86_64-20180415 31% of 292 MB 3586 kBps 01m21s/var/tmp/dfly-update/DragonFly-x86_64-20180415 33% of 292 MB 3618 kBps 01m19s/var/tmp/dfly-update/DragonFly-x86_64-20180415 34% of 292 MB 3616 kBps 01m16s/var/tmp/dfly-update/DragonFly-x86_64-20180415 35% of 292 MB 3674 kBps 01m14s/var/tmp/dfly-update/DragonFly-x86_64-20180415 36% of 292 MB 3274 kBps 01m12s/var/tmp/dfly-update/DragonFly-x86_64-20180415 37% of 292 MB 3289 kBps 01m11s/var/tmp/dfly-update/DragonFly-x86_64-20180415 38% of 292 MB 3528 kBps 01m09s/var/tmp/dfly-update/DragonFly-x86_64-20180415 40% of 292 MB 3552 kBps 01m07s/var/tmp/dfly-update/DragonFly-x86_64-20180415 41% of 292 MB 3541 kBps 01m05s/var/tmp/dfly-update/DragonFly-x86_64-20180415 42% of 292 MB 3597 kBps 01m03s/var/tmp/dfly-update/DragonFly-x86_64-20180415 43% of 292 MB 3647 kBps 01m02s/var/tmp/dfly-update/DragonFly-x86_64-20180415 44% of 292 MB 3646 kBps 01m00s/var/tmp/dfly-update/DragonFly-x86_64-20180415 46% of 292 MB 3622 kBps 00m58s/var/tmp/dfly-update/DragonFly-x86_64-20180415 47% of 292 MB 3569 kBps 00m56s/var/tmp/dfly-update/DragonFly-x86_64-20180415 48% of 292 MB 3661 kBps 00m55s/var/tmp/dfly-update/DragonFly-x86_64-20180415 49% of 292 MB 3673 kBps 00m53s/var/tmp/dfly-update/DragonFly-x86_64-20180415 50% of 292 MB 3645 kBps 00m52s/var/tmp/dfly-update/DragonFly-x86_64-20180415 52% of 292 MB 3564 kBps 00m50s/var/tmp/dfly-update/DragonFly-x86_64-20180415 53% of 292 MB 3582 kBps 00m49s/var/tmp/dfly-update/DragonFly-x86_64-20180415 54% of 292 MB 3697 kBps 00m47s/var/tmp/dfly-update/DragonFly-x86_64-20180415 55% of 292 MB 3567 kBps 00m46s/var/tmp/dfly-update/DragonFly-x86_64-20180415 56% of 292 MB 3611 kBps 00m44s/var/tmp/dfly-update/DragonFly-x86_64-20180415 58% of 292 MB 3603 kBps 00m43s/var/tmp/dfly-update/DragonFly-x86_64-20180415 59% of 292 MB 3528 kBps 00m41s/var/tmp/dfly-update/DragonFly-x86_64-20180415 60% of 292 MB 2742 kBps 00m40s/var/tmp/dfly-update/DragonFly-x86_64-20180415 60% of 292 MB 1104 kBps 00m40s/var/tmp/dfly-update/DragonFly-x86_64-20180415 61% of 292 MB 2380 kBps 00m40s/var/tmp/dfly-update/DragonFly-x86_64-20180415 62% of 292 MB 2474 kBps 00m39s/var/tmp/dfly-update/DragonFly-x86_64-20180415 63% of 292 MB 3005 kBps 00m38s/var/tmp/dfly-update/DragonFly-x86_64-20180415 64% of 292 MB 3120 kBps 00m37s/var/tmp/dfly-update/DragonFly-x86_64-20180415 65% of 292 MB 3586 kBps 00m35s/var/tmp/dfly-update/DragonFly-x86_64-20180415 66% of 292 MB 3585 kBps 00m34s/var/tmp/dfly-update/DragonFly-x86_64-20180415 67% of 292 MB 3290 kBps 00m33s/var/tmp/dfly-update/DragonFly-x86_64-20180415 69% of 292 MB 3544 kBps 00m31s/var/tmp/dfly-update/DragonFly-x86_64-20180415 70% of 292 MB 3565 kBps 00m30s/var/tmp/dfly-update/DragonFly-x86_64-20180415 71% of 292 MB 3436 kBps 00m29s/var/tmp/dfly-update/DragonFly-x86_64-20180415 72% of 292 MB 3059 kBps 00m28s/var/tmp/dfly-update/DragonFly-x86_64-20180415 73% of 292 MB 3346 kBps 00m26s/var/tmp/dfly-update/DragonFly-x86_64-20180415 74% of 292 MB 3580 kBps 00m25s/var/tmp/dfly-update/DragonFly-x86_64-20180415 75% of 292 MB 3447 kBps 00m24s/var/tmp/dfly-update/DragonFly-x86_64-20180415 77% of 292 MB 3589 kBps 00m23s/var/tmp/dfly-update/DragonFly-x86_64-20180415 78% of 292 MB 3661 kBps 00m21s/var/tmp/dfly-update/DragonFly-x86_64-20180415 79% of 292 MB 3527 kBps 00m20s/var/tmp/dfly-update/DragonFly-x86_64-20180415 80% of 292 MB 3639 kBps 00m19s/var/tmp/dfly-update/DragonFly-x86_64-20180415 81% of 292 MB 3634 kBps 00m18s/var/tmp/dfly-update/DragonFly-x86_64-20180415 83% of 292 MB 3636 kBps 00m16s/var/tmp/dfly-update/DragonFly-x86_64-20180415 84% of 292 MB 3490 kBps 00m15s/var/tmp/dfly-update/DragonFly-x86_64-20180415 85% of 292 MB 3171 kBps 00m14s/var/tmp/dfly-update/DragonFly-x86_64-20180415 86% of 292 MB 3372 kBps 00m13s/var/tmp/dfly-update/DragonFly-x86_64-20180415 87% of 292 MB 3596 kBps 00m12s/var/tmp/dfly-update/DragonFly-x86_64-20180415 88% of 292 MB 3467 kBps 00m11s/var/tmp/dfly-update/DragonFly-x86_64-20180415 90% of 292 MB 3451 kBps 00m09s/var/tmp/dfly-update/DragonFly-x86_64-20180415 91% of 292 MB 3123 kBps 00m08s/var/tmp/dfly-update/DragonFly-x86_64-20180415 92% of 292 MB 3062 kBps 00m07s/var/tmp/dfly-update/DragonFly-x86_64-20180415 93% of 292 MB 3252 kBps 00m06s/var/tmp/dfly-update/DragonFly-x86_64-20180415 94% of 292 MB 3540 kBps 00m05s/var/tmp/dfly-update/DragonFly-x86_64-20180415 95% of 292 MB 3371 kBps 00m04s/var/tmp/dfly-update/DragonFly-x86_64-20180415 96% of 292 MB 3316 kBps 00m03s/var/tmp/dfly-update/DragonFly-x86_64-20180415 97% of 292 MB 2330 kBps 00m02s/var/tmp/dfly-update/DragonFly-x86_64-20180415 98% of 292 MB 3256 kBps 00m01s/var/tmp/dfly-update/DragonFly-x86_64-20180415 99% of 292 MB 3250 kBps 01m38s/var/tmp/dfly-update/DragonFly-x86_64-20180415100% of 292 MB 3064 kBps 01m38s +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 + * /etc/fstab + * /etc/group + * /etc/localtime + * /etc/master.passwd + * /etc/passwd + * /etc/pwd.db + * /etc/rc.conf + * /etc/spwd.db + => 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 + * /etc/fstab + * /etc/group + * /etc/localtime + * /etc/master.passwd + * /etc/passwd + * /etc/pwd.db + * /etc/rc.conf + * /etc/spwd.db + => DONE! +Upgrading system ... + => Coping new /etc to: /var/tmp/dfly-update/etc.new + => Removing ignored files ... + * /var/tmp/dfly-update/etc.new/group + * /var/tmp/dfly-update/etc.new/master.passwd + * /var/tmp/dfly-update/etc.new/passwd + * /var/tmp/dfly-update/etc.new/pwd.db + * /var/tmp/dfly-update/etc.new/rc.conf + * /var/tmp/dfly-update/etc.new/spwd.db + => 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 ++=========================================================+ + -- cgit v1.2.2