diff options
| author | Matt Housh <jaeger@crux.nu> | 2014-07-16 15:40:23 -0500 |
|---|---|---|
| committer | Matt Housh <jaeger@crux.nu> | 2014-07-16 15:40:23 -0500 |
| commit | 4bc00673a0498a92c63bbcc549842f82710cd265 (patch) | |
| tree | 5333ec2832664e9af6b48499d6c91d59d6c46bb3 /iso | |
| parent | aa51bb6436476b0001e2a12f53a66aa060b08010 (diff) | |
| download | iso-4bc00673a0498a92c63bbcc549842f82710cd265.tar.gz iso-4bc00673a0498a92c63bbcc549842f82710cd265.tar.xz | |
Fix incorrect handling of .inactive ports files during upgrade
Diffstat (limited to 'iso')
| -rwxr-xr-x | iso/bin/setup | 12 | ||||
| -rwxr-xr-x | iso/bin/setup-helper | 9 |
2 files changed, 11 insertions, 10 deletions
diff --git a/iso/bin/setup b/iso/bin/setup index 3049b72..f793a4b 100755 --- a/iso/bin/setup +++ b/iso/bin/setup @@ -306,7 +306,17 @@ main() { (/usr/bin/setup-helper $ROOT &> $helperlogfile) | do_dialog \ --title " Please wait [3.0 -> 3.1 check]" --gauge "" 8 60 0 fi - install_packages + install_packages + + # one-time fix for .inactive ports files + if [ -f $ROOT/etc/ports/contrib.rsync.inactive -a -f $ROOT/etc/ports/contrib.rsync ]; then + mkdir -p $ROOT/var/lib/pkg/rejected/etc/ports + mv -f $ROOT/etc/ports/contrib.rsync.inactive $ROOT/var/lib/pkg/rejected/etc/ports/contrib.rsync + fi + if [ -f $ROOT/etc/ports/compat-32.rsync.inactive -a -f $ROOT/etc/ports/compat-32.rsync ]; then + mkdir -p $ROOT/var/lib/pkg/rejected/etc/ports + mv -f $ROOT/etc/ports/compat-32.rsync.inactive $ROOT/var/lib/pkg/rejected/etc/ports/compat-32.rsync + fi cat $helperlogfile 2> /dev/null } diff --git a/iso/bin/setup-helper b/iso/bin/setup-helper index 7dfd35b..a84b4d1 100755 --- a/iso/bin/setup-helper +++ b/iso/bin/setup-helper @@ -138,12 +138,3 @@ inject_packages eudev remove_packages net-tools traceroute inject_packages inetutils - -# update the contrib and compat-32 rsync files if they're active -if [ -f $ROOT/etc/ports/contrib.rsync ]; then - mv -f $ROOT/etc/ports/contrib.rsync{.inactive,} -fi - -if [ -f $ROOT/etc/ports/compat-32.rsync ]; then - mv -f $ROOT/etc/ports/compat-32.rsync{.inactive,} -fi |