diff options
| -rwxr-xr-x | archsetup | 22 | ||||
| -rwxr-xr-x | dotfiles/system/.local/bin/lkg | 4 | ||||
| -rwxr-xr-x | dotfiles/system/.local/bin/lkg_rollback | 12 |
3 files changed, 2 insertions, 36 deletions
@@ -1176,27 +1176,9 @@ EOF display "task" "zfs-replicate timer created (enable after SSH key setup to TrueNAS)" elif is_btrfs_root; then - # Btrfs: Install timeshift-autosnap and grub-btrfs - display "task" "btrfs detected - installing snapshot tools" - aur_install timeshift-autosnap - pacman_install grub-btrfs - action="enabling snapshot boot menu updates" && display "task" "$action" - systemctl enable grub-btrfsd >> "$logfile" 2>&1 || error_warn "$action" "$?" - - action="starting snapshot boot menu updates" && display "task" "$action" - # starting and stopping service to generate the grub-btrfs config - systemctl start grub-btrfsd >> "$logfile" 2>&1 || error_warn "$action" "$?" - systemctl stop grub-btrfsd >> "$logfile" 2>&1 || error_warn "$action" "$?" - # edit grub-btrfs config for timeshift auto snapshot support - sed -i \ - 's|ExecStart=/usr/bin/grub-btrfsd --syslog /.snapshots|ExecStart=/usr/bin/grub-btrfsd --syslog --timeshift-auto|' \ - /etc/systemd/system/grub-btrfsd.service - - action="regenerating boot menu" && display "task" "$action" - grub-mkconfig -o /boot/grub/grub.cfg >> "$logfile" 2>&1 || error_warn "$action" "$?" + display "task" "btrfs filesystem detected" else - # ext4 or other filesystem - no automatic snapshots - display "task" "ext4/other filesystem detected - skipping snapshot tools" + display "task" "ext4/other filesystem detected" fi } diff --git a/dotfiles/system/.local/bin/lkg b/dotfiles/system/.local/bin/lkg deleted file mode 100755 index aa9b3f1..0000000 --- a/dotfiles/system/.local/bin/lkg +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh -# Craig Jennings <c@cjennings.net> - -sudo zfs destroy -rR zroot@lkg && sudo zfs snapshot -r zroot@lkg && echo "lkg snapshot reset" || echo "lkg snapshot failed!" diff --git a/dotfiles/system/.local/bin/lkg_rollback b/dotfiles/system/.local/bin/lkg_rollback deleted file mode 100755 index 3cf4c59..0000000 --- a/dotfiles/system/.local/bin/lkg_rollback +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -sudo zfs rollback -rR zroot/var@lkg -sudo zfs rollback -rR zroot/var/log@lkg -sudo zfs rollback -rR zroot/usr@lkg -sudo zfs rollback -rR zroot/usr/home@lkg -sudo zfs rollback -rR zroot/ROOT/default@lkg -sudo zfs rollback -rR zroot/ROOT@lkg -sudo zfs rollback -rR zroot@lkg - -echo ""; echo "rollback complete. rebooting..." -sudo shutdown -r now |