Differential D39695 Diff 137020 usr.sbin/freebsd-update/freebsd-update.sh

Changeset View

Standalone View

View Options

usr.sbin/freebsd-update/freebsd-update.sh

Show First 20 Lines • Show All 649 Lines • ▼ Show 20 Lines stats)

STATSREDIR="/dev/stdout" STATSREDIR="/dev/stdout"

DDSTATS="" DDSTATS=""

XARGST="" XARGST=""

NDEBUG="-n" NDEBUG="-n"

;; ;;

esac esac

} }

# Check if there are any kernel modules installed from ports.

# In that case warn the user that a rebuild from ports (i.e. not from

# packages) might need necessary for the modules to work in the new release.

upgrade_check_kmod_ports() {

local mod_name

local modules

local pattern

local pkg_name

local port_name

local report

local w

if ! command -v pkg >/dev/null; then

delphijUnsubmitted

Done

Before proceeding any further, we should check if pkg is present. Something like:

if pkg -N 2>/dev/null ; then
    (code that expects pkg to be present)
else
    return
fi

would do it. Otherwise freebsd-update will attempt to install pkg.

delphij: Before proceeding any further, we should check if `pkg` is present. Something like: ``` if…

fernapeAuthorUnsubmitted

Done

Thanks, that makes sense.

fernape: Thanks, that makes sense.

echo "Skipping kernel modules check. pkg(8) not present."

return

delphijUnsubmitted

Done

# in every path configured in module_path

- pattern=$(grep module_path /boot/loader.conf |

+ pattern=$(grep ^module_path= /boot/loader.conf | tail -1 |

cut -f2 -d\" |

I think it's probably a good idea to only match the last module_path= instead of matching all module_path (they may be commented out, or overridden by a later occurrence).

delphij: I think it's probably a good idea to only match the last `module_path=` instead of matching all…

fernapeAuthorUnsubmitted

Done

Done.

I also added /boot/modules as a fallback case.

fernape: Done. I also added `/boot/modules` as a fallback case.

# Most modules are in /boot/modules but we should actually look

# in every path configured in module_path

search_files="/boot/defaults/loader.conf /boot/loader.conf"

delphijUnsubmitted

Done

# in every path configured in module_path

- pattern=$(grep -E '^module_path=' /boot/loader.conf |

+ pattern=$(grep -hE '^module_path=' /boot/defaults/loader.conf /boot/loader.conf |

tail -1 |

I think you can avoid hardcoding the value by simply grep'ing the defaults and the canonical loader.conf in this order...

delphij: I think you can avoid hardcoding the value by simply grep'ing the defaults and the canonical…

fernapeAuthorUnsubmitted

Done

Nice!

Thank you.

fernape: Nice! Thank you.

pattern=$(grep -shE '^module_path=' ${search_files} |

zleiUnsubmitted

Done

search_files="/boot/defaults/loader.conf /boot/loader.conf"

- pattern=$(grep -E '^module_path=' ${search_files} |

+ pattern=$(grep -shE '^module_path=' ${search_files} |

tail -1 |

Shall it be warned if either /boot/defaults/loader.conf or /boot/loader.conf does not exist ?

zlei: Shall it be warned if either `/boot/defaults/loader.conf` or `/boot/loader.conf` does not exist…

tail -1 |

cut -f2 -d\" |

tr ";" "|")

if [ -z "${pattern}" ]; then

# Not having module_path in loader.conf is probably an error.

# Check at least the most common path

pattern="/boot/modules"

# Check the pkg database for modules installed in those directories

modules=$(pkg query '%Fp' | grep -E "${pattern}")

if [ -z "${modules}" ]; then

return

echo -e "\n"

echo "The following modules have been installed from packages."

echo "As a consequence they might not work when performing a major or minor upgrade."

zleiUnsubmitted

Done

echo "The following modules have been installed from packages."

- echo "As a consequence they might not work when performing a major upgrade."

+ echo "As a consequence they might not work when performing a major or minor upgrade."

echo -e "It is advised to rebuild these ports:\n"

Minor upgrade should also be warned.

zlei: Minor upgrade should also be warned.

echo -e "It is advised to rebuild these ports:\n"

zleiUnsubmitted

Not Done

It is advised to rebuild these ports:

Or
It is advised to re-install these packages or rebuild these ports: ?

These modules are previously installed from packages, users may prefer to re-install them rather than rebuild from ports.

zlei: > It is advised to rebuild these ports: Or `It is advised to re-install these packages or…

fernapeAuthorUnsubmitted

Done

Reinstalling packages might not work depending on the timing. Packages are built for the minor version of FreeBSD. If someone upgrades from 13.1 to 13.2 today (as I did) and then try to load, for instance, the virtualbox modules , they will get these messages:

kldload: an error occurred while loading module vboxdrv. Please check dmesg(8) for more details.
kldload: an error occurred while loading module vboxnetadp. Please check dmesg(8) for more details.

and in dmesg(8):

KLD vboxdrv.ko: depends on kernel - not available or version mismatch
linker_load_file: /boot/modules/vboxdrv.ko - unsupported file type
KLD vboxnetadp.ko: depends on vboxdrv - not available or version mismatch
linker_load_file: /boot/modules/vboxnetadp.ko - unsupported file type

Reinstalling from packages will only work once the package builders are using 13.2 (in the example) which will presumably be when 13.1 is EOLed.

See this note in the Handbook.

fernape: Reinstalling packages might not work depending on the timing. Packages are built for the minor…

zleiUnsubmitted

Not Done

I see.

For minor version upgrades (e.g., 13.1 to 13.2), the ABI is guaranteed to be stable, so normal packages ( those built on 13.1 ) will continue to work, but some special packages those providing kernel modules such as virtualbox-ose-kmod may not work.

So can we have different port build policy for those special packages ? Just build them ( on 13.2 ) immediately so that the upgrade will be smooth.

Also CC releng .

zlei: I see. For minor version upgrades (e.g., 13.1 to 13.2), the ABI is guaranteed to be stable…

fernapeAuthorUnsubmitted

Done

Yes, that would reduce the problematic window, although I don't know how many resources we have for that.
Another approach would be to trigger the rebuild of the ports containing kernel modules from the freebsd-update upgrade -r ... invocation.
But for that we would need to:

Checkout the specific port + build dependencies
Rebuild everything in a contained environment (so poudriere, synth or some kind of chroot)

And that might be very expensive. For instance, after upgrading from 13.1 to 13.2 I rebuilt virtualbox-ose-kmod for 13.2 using a poudriere jail. But it took a while because it builds with gcc and it needed to be rebuilt.

Some Linux distros trigger the rebuilding of drivers when upgrading. Because the system is so bloated in the first time, they don't need any extra dependencies, everything is in the system already (git, gcc, binutils, etc.)

fernape: Yes, that would reduce the problematic window, although I don't know how many resources we have…

zleiUnsubmitted

Not Done

echo "As a consequence they might not work when performing a major upgrade."

- echo -e "It is advised to rebuild these ports:\n"

+ echo -e "It is advised to rebuild these ports from source:\n"

report="Module Package Port\n------ ------- ----\n"

Explicitly note build from source .

zlei: Explicitly note `build from source` .

fernapeAuthorUnsubmitted

Done

Aren't ports by definition built always from source?

fernape: Aren't ports by definition built always from source?

zleiUnsubmitted

Done

Aren't ports by definition built always from source?

I think YES. So

Explicitly note build from source

is not needed.

zlei: > Aren't ports by definition built always from source? I think YES. So > Explicitly note build…

report="Module Package Port\n------ ------- ----\n"

for module in ${modules}; do

w=$(pkg which "${module}")

mod_name=$(echo "${w}" | awk '{print $1;}')

pkg_name=$(echo "${w}" | awk '{print $6;}')

zleiUnsubmitted

Not Done

mod_name=$(echo "${w}" | awk '{print $1;}')

- pkg_name=$(echo "${w}" | awk '{print $6;}')

+ mod_name="$module"

+ pkg_name=$(pkg which -q "${module}")

+ port_name=$(pkg which -oq "${module}")

port_name=$(pkg info -o "${pkg_name}" | awk '{print $2;}')

zlei:

port_name=$(pkg info -o "${pkg_name}" | awk '{print $2;}')

report="${report}${mod_name} ${pkg_name} ${port_name}\n"

done

echo -e "${report}" | column -t

echo -e "\n"

}

# Perform sanity checks and set some final parameters # Perform sanity checks and set some final parameters

# in preparation for fetching files. Figure out which # in preparation for fetching files. Figure out which

# set of updates should be downloaded: If the user is # set of updates should be downloaded: If the user is

# running *-p[0-9]+, strip off the last part; if the # running *-p[0-9]+, strip off the last part; if the

# user is running -SECURITY, call it -RELEASE. Chdir # user is running -SECURITY, call it -RELEASE. Chdir

# into the working directory. # into the working directory.

fetchupgrade_check_params () { fetchupgrade_check_params () {

export HTTP_USER_AGENT="freebsd-update (${COMMAND}, `uname -r`)" export HTTP_USER_AGENT="freebsd-update (${COMMAND}, `uname -r`)"

▲ Show 20 Lines • Show All 2,795 Lines • ▼ Show 20 Lines cmd_cron () {

rm ${TMPFILE} rm ${TMPFILE}

} }

# Fetch files for upgrading to a new release. # Fetch files for upgrading to a new release.

cmd_upgrade () { cmd_upgrade () {

finalize_components_config ${COMPONENTS} finalize_components_config ${COMPONENTS}

upgrade_check_params upgrade_check_params

upgrade_check_kmod_ports

upgrade_run || exit 1 upgrade_run || exit 1

} }

# Check if there are fetched updates ready to install. # Check if there are fetched updates ready to install.

# Chdir into the working directory. # Chdir into the working directory.

cmd_updatesready () { cmd_updatesready () {

finalize_components_config ${COMPONENTS} finalize_components_config ${COMPONENTS}

# Check if working directory exists (if not, no updates pending) # Check if working directory exists (if not, no updates pending)

▲ Show 20 Lines • Show All 71 Lines • Show Last 20 Lines