Skip to content

Add support for systems with /boot outside the @-subvolume #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Add support for systems with /boot outside the @-subvolume #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
270cb8d
Add support for systems with /boot outside the @-subvolume
zapp-brannigan Dec 26, 2022
1ef412d
Add support for systems with /boot outside the @-subvolume
zapp-brannigan Dec 26, 2022
fd6b05a
Set default value for "external_boot"
zapp-brannigan Dec 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions snapper-rollback.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,10 @@ mountpoint = /btrfsroot
# mount this device there before rolling back. This parameter is optional, but
# if unset, you'll have to mount your btrfs root manually.
#dev = /dev/sda42

# If your /boot is located outside the `subvol_main` you have to back it up manually.
# Please use the pacman-hook suggested in
# https://wiki.archlinux.org/title/System_backup#Snapshots_and_/boot_partition
# In such a case set `external_boot` to True
external_boot = False
boot_backup_dir = /.bootbackup
23 changes: 21 additions & 2 deletions snapper-rollback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def parse_args():


def read_config(configfile):
config = configparser.ConfigParser()
config = configparser.ConfigParser({"external_boot":"False"})
config.read(configfile)
return config

Expand Down Expand Up @@ -125,10 +125,23 @@ def rollback(subvol_main, subvol_main_newname, subvol_rollback_src, dev, dry_run
os.rename(subvol_main_newname, subvol_main)


def rollback_boot_partiton(boot_backup_dir,dry_run):
full_path = boot_backup_dir+"/boot"
if dry_run:
LOG.info("rm -rf /boot/*")
LOG.info("cp -a {}/* /boot/".format(full_path))
else:
os.system("rm -rf /boot/*")
os.system("cp -a {}/* /boot/".format(full_path))


def main():
args = parse_args()
config = read_config(args.config)


if os.path.ismount("/boot") and config.get("root", "external_boot") == "False":
LOG.warning("/boot is outside the `subvol_main`, your system may not boot after rollback!")

mountpoint = pathlib.Path(config.get("root", "mountpoint"))
subvol_main = mountpoint / config.get("root", "subvol_main")
subvol_rollback_src = (
Expand Down Expand Up @@ -164,6 +177,12 @@ def main():
except PermissionError as e:
LOG.fatal("Permission denied: {}".format(e))
exit(1)
try:
if config.get("root", "external_boot") == "True" and os.path.ismount("/boot"):
boot_backup_dir = str(subvol_rollback_src) + config.get("root", "boot_backup_dir")
rollback_boot_partiton(boot_backup_dir,dry_run=args.dry_run)
except Exception as e:
LOG.fatal("Error: {}".format(e))


if __name__ == "__main__":
Expand Down