summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Housh <jaeger@crux.nu>2014-07-08 07:35:05 -0500
committerMatt Housh <jaeger@crux.nu>2014-07-08 07:35:05 -0500
commitbde7f466e00912a432495597acd64fa9b4601647 (patch)
tree1619faef7672d4bb4d49b4022f8bf811b10e129d
parent93beab1b53ea630c9706bbfabf9e7cfa93b41873 (diff)
downloadiso-bde7f466e00912a432495597acd64fa9b4601647.tar.gz
iso-bde7f466e00912a432495597acd64fa9b4601647.tar.xz
setup: added note about rejmerge to upgrade text
-rwxr-xr-xiso/bin/setup2
1 files changed, 1 insertions, 1 deletions
diff --git a/iso/bin/setup b/iso/bin/setup
index 524fd5b..3049b72 100755
--- a/iso/bin/setup
+++ b/iso/bin/setup
@@ -54,7 +54,7 @@ select_action() {
ACTION="INSTALL"
else
ACTION="UPGRADE"
- do_select --aspect 5 --yesno "NOTE!\n\nBefore upgrading make sure /etc/pkgadd.conf in the old installation is tuned to fit your needs, important files might otherwise be overwritten. Further, when this script has completed the upgrade you need to go though the rejected files in /var/lib/pkg/rejected/ and upgrade them manually if needed. See the pkgadd(8) man page for more information about /etc/pkgadd.conf.\n\nAre you really sure you want to continue?" 0 0
+ do_select --aspect 5 --yesno "NOTE!\n\nBefore upgrading make sure /etc/pkgadd.conf in the old installation is tuned to fit your needs, important files might otherwise be overwritten. Further, when setup has completed the upgrade you need to go though the rejected files in /var/lib/pkg/rejected/ and upgrade them manually if needed (or use the rejmerge(8) tool). See the pkgadd(8) man page for more information about /etc/pkgadd.conf.\n\nAre you really sure you want to continue?" 0 0
fi
}

Generated by cgit