08c39d4991
- Import commit 58ea3c819cca1639ef8c922505c573ba5e262b3d 334945091 shutdown: fix incorrect fscanf() result check (#6806) 027202892 shutdown: don't remount,ro network filesystems. (#6588) (bsc#1035386) bc77b53a5 shutdown: don't be fooled when detaching DM devices with BTRFS (boo#1055641) d9d293847 util: make get_block_device() available 421ce7382 tmpfiles: silently ignore any path that passes through autofs (#6506) (bsc#1045472) ca8f90e62 device: make sure to remove all device units sharing the same sysfs path (#6679) - Make use of "%tmpfiles_create" in %post of the logger subpackage - Add scripts-udev-convert-lib-udev-path.sh (bsc#1050152) This script takes care of converting /lib/udev into a symlink pointing to /usr/lib/udev when upgrading a distro using an old version of udev. - Make use of "%make_build" rpm macro - Renumber scripts to start at index 100 - Introduce scripts-systemd-upgrade-from-pre-210.sh It collects all existing hacks done in %post to fix old/deprecated settings in systemd older than 210. This includes hacks needed to fix system that are migrating from SysV. There shouldn't be any functional changes. - Move scripts for packaging workaround/fixes in /usr/lib/systemd/scripts It also renames fix-machines-subvol-for-rollbacks.sh into scripts-systemd-fix-machines-btrfs-subvol.sh Note that the "scripts-systemd-" prefix is used for those scripts so we can gather them. Why not using a directory instead ? because osc OBS-URL: https://build.opensuse.org/request/show/526193 OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=988
128 lines
3.4 KiB
Bash
128 lines
3.4 KiB
Bash
#! /bin/bash
|
|
#
|
|
# This is used to initially create /var/lib/machines subvolume in case
|
|
# the system we're running on is using BTRFS with the specific layout
|
|
# used by snapper to perform snapshots, rollbacks, etc...
|
|
#
|
|
# Unfortunately some distros (TW) already shipped versions with
|
|
# systemd creating a plain subvolume which breaks snapper.
|
|
#
|
|
# If /var/lib/machines is already populated then it's going to be
|
|
# pretty ugly to convert the old subvolume into a new one specially
|
|
# since it can be in use.
|
|
#
|
|
# Hopefully not a lot of users are using machinectl to import
|
|
# container/VM images. So in most of the cases this directory should
|
|
# be empty and we can then simple delete the subvolume and create a
|
|
# new one respecting the snapper layout.
|
|
#
|
|
# In the rare case where /var/lib/machines is populated, we will warn
|
|
# the user and let him fix it manually.
|
|
#
|
|
# In order to avoid ugly dependencies added in systemd package, this
|
|
# script should only be called during package updates when
|
|
# mksubvolume(8) is available. During installation, /var/lib/machines
|
|
# is supposed to be created by the installer now.
|
|
#
|
|
# See bsc#992573
|
|
#
|
|
|
|
warn() {
|
|
echo >&2 "warning: $@"
|
|
}
|
|
|
|
is_btrfs_subvolume() {
|
|
# On btrfs subvolumes always have the inode 256
|
|
test $(stat --format=%i "$1") -eq 256
|
|
}
|
|
|
|
# This assumes the directory/subvol is emptied by the caller.
|
|
rm_subvolume_or_directory() {
|
|
is_btrfs_subvolume "$1" && {
|
|
btrfs subvolume delete "$1"
|
|
return
|
|
}
|
|
rmdir "$1"
|
|
}
|
|
|
|
on_exit() {
|
|
# Simply print a common error message in case something went
|
|
# wrong.
|
|
if test $? -ne 0; then
|
|
warn "Please fix /var/lib/machines manually."
|
|
# FIXME: point to a documentation explaining how to do
|
|
# that.
|
|
exit 1
|
|
fi
|
|
}
|
|
|
|
#
|
|
# If there's already an entry in fstab for /var/lib/machines, it
|
|
# means that:
|
|
#
|
|
# - the installer initialized /var/lib/machines correctly (default)
|
|
# - we already fixed it
|
|
# - the sysadmin added it manually
|
|
#
|
|
# In any cases we should exit.
|
|
#
|
|
# Note: we can't simply check if /var/lib/machines has been mounted
|
|
# because an update through a chroot might be in progress (see
|
|
# bsc#1030290).
|
|
#
|
|
if mount --fake /var/lib/machines 2>/dev/null; then
|
|
exit
|
|
fi
|
|
|
|
#
|
|
# If something is already mounted don't try to fix anything, it's been
|
|
# done manually by the sysadmin.
|
|
#
|
|
if mountpoint -q /var/lib/machines; then
|
|
exit
|
|
fi
|
|
|
|
#
|
|
# Let's try to figure out if the current filesystem uses a Snapper
|
|
# BTRFS specific layout. Note that TW uses a different layout than
|
|
# SLE...
|
|
#
|
|
# FIXME: not sure if it's correct, reliable or optimal.
|
|
#
|
|
case $(findmnt -nr -t btrfs -o FSROOT / 2>/dev/null) in
|
|
*.snapshots/*/snapshot*)
|
|
;;
|
|
*)
|
|
exit 0
|
|
esac
|
|
|
|
trap on_exit EXIT
|
|
|
|
if test -d /var/lib/machines; then
|
|
#
|
|
# Ok, we're on a system supporting rollbacks and
|
|
# /var/lib/machines is not a subvolume remotely mounted so it
|
|
# cannot be suitable for systems supporting rollback. Fix it.
|
|
#
|
|
echo "Making /var/lib/machines suitable for rollbacks..."
|
|
|
|
type mksubvolume >/dev/null 2>&1 || {
|
|
warn "mksubvolume(8) is not installed, aborting."
|
|
exit 1
|
|
}
|
|
test "$(ls -A /var/lib/machines/)" && {
|
|
warn "/var/lib/machines is not empty, aborting."
|
|
exit 1
|
|
}
|
|
|
|
echo "Deleting empty /var/lib/machines directory/subvolume"
|
|
rm_subvolume_or_directory /var/lib/machines || {
|
|
warn "fail to delete /var/lib/machines"
|
|
exit 1
|
|
}
|
|
fi
|
|
|
|
# At this point /var/lib/machines shouldn't exist.
|
|
echo "Creating /var/lib/machines subvolume suitable for rollbacks."
|
|
mksubvolume /var/lib/machines
|