From 61389659a4f0b7a718a3e8fd5a7c9cbddc58c152 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sat, 18 Feb 2023 21:05:31 -0700 Subject: [PATCH] fix --- debian.sh | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/debian.sh b/debian.sh index 7bf2767..7afa543 100755 --- a/debian.sh +++ b/debian.sh @@ -37,6 +37,8 @@ ROOT_MAPPER_NAME='root' BACKUP_DISK='/dev/disk/by-uuid/727916c5-a526-47d8-8351-9a0479463738' BACKUP_DISK_MAPPER='usb' BACKUP_DISK_ROOT_NAME='usbdebian' +BACKUP_DISK_IMAGES='/home/verita84/Nextcloud/backups' +#BACKUP_DISK_IMAGES="$TARGET/\@$BACKUP_DISK_ROOT_NAME/var/backups/" ###################################### USER="verita84" USER_PASSWORD="123456" @@ -54,7 +56,7 @@ FLATPAKS+=(app/net.brinkervii.grapejuice org.kde.kdenlive) #Packages PACKAGES=" minidlna libsecret-tools libglu1-mesa preload flatpak powertop blueman acpi neofetch cockpit cockpit-podman packagekit cockpit-packagekit cockpit-pcp cockpit-storaged redis " BASE_PACKAGES=" cups apt-transport-https samba samba-common nfs-common nfs-kernel-server linux-cpupower locales zram-tools acpid podman ghostscript cifs-utils ntp vim-airline rsync screen base udev git network-manager efibootmgr linux-headers-amd64 cryptsetup network-manager-openvpn ntp screen docbook-xsl alsa-utils sysstat fuse3 build-essential unzip bash-completion parted dosfstools wget curl " -SHARED_DESKTOP_APPS=" firefox-esr yt-dlp keepassxc rssguard telegram-desktop gnome gimp gnome-tweaks evolution nextcloud-desktop gnome-photos handbrake vlc libreoffice " +SHARED_DESKTOP_APPS=" gnome-software-plugin-flatpak firefox-esr yt-dlp keepassxc rssguard telegram-desktop gnome gimp gnome-tweaks evolution nextcloud-desktop gnome-photos handbrake vlc libreoffice " #Removed for Debian Bullseye. Works on Bookworm #REMOVED=" aardvark-dns podman-compose podman-toolbox " VIRTUALIZATION=" virt-manager qemu-system libvirt-daemon-system ovmf cockpit-machines" @@ -71,15 +73,16 @@ create-os-snapshots() { echo echo "[Creating new snapshots.....]" echo - mkdir -p $TARGET/\@$BACKUP_DISK_MAPPER/var/backups - time tar cvpzf $TARGET/\@$BACKUP_DISK_ROOT_NAME/var/backups/$1.tgz --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=$TARGET/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/postgresql --exclude=/var/lib/containers / + #mkdir -p $TARGET/\@$BACKUP_DISK_MAPPER/var/backups + time tar cvpzf $BACKUP_DISK_IMAGES/$1.tgz --exclude=/volumes/* --exclude=/mnt/* --exclude=/var/tmp/* --exclude=/tmp/* --exclude=/raid/* --exclude=/root/* --exclude=/var/cache/apt/archives/* --exclude=/proc/* --exclude=/.snapshots/* --exclude=$TARGET/* --exclude=/var/lib/libvirt/* --exclude=/dev/* --exclude=/sys/* --exclude=/home/* --exclude=/var/lib/flatpak --exclude=/var/lib/postgresql --exclude=/var/lib/containers / + chown $USER:$USER $BACKUP_DISK_IMAGES/$1.tgz } homeBackup() { echo echo "[Copying USER data....]" echo - rsync --progress -avz --delete /home/ --exclude=.cache/ --exclude=.local/share/containers $TARGET/\@home/ + rsync --progress -avz --delete /home/ --exclude=.cache --exclude=.local/share/flatpak --exclude=.local/share/containers $TARGET/\@home/ } os-backup() { @@ -90,7 +93,7 @@ os-backup() { echo "[Mounting.....]" echo mount /dev/mapper/$BACKUP_DISK_MAPPER $TARGET - + if [[ -e "$TARGET/@$BACKUP_DISK_ROOT_NAME/usr/bin/bash" ]]; then if [ "$2" = "home" ]; then homeBackup @@ -121,7 +124,7 @@ os-backup() { os-restore() { partitions rm -rf $TARGET/usr $TARGET/sbin $TARGET/lib32 $TARGET/libx32 $TARGET/lib $TARGET/vmlinuz* $TARGET/initrd* $TARGET/bin $TARGET/var $TARGET/root $TARGET/opt $TARGET/etc $TARGET/run - tar xfpv /var/backups/$2.tgz -C $TARGET/ + tar xfpv $BACKUP_DISK_IMAGES/$2.tgz -C $TARGET/ if [ "$3" = "home" ]; then rsync -av --progress --delete /home/ $TARGET/home/ @@ -232,7 +235,7 @@ install() { } desktop() { - SERVICES+=(exim4 cockpit.socket redis-server apparmor nfs-server smbd rpbind rpcbind.socket avahi-daemon bluetooth minidlna openvpn) + SERVICES+=(pmcd pmie pmlogger pmproxy exim4 cockpit.socket redis-server apparmor nfs-server smbd rpbind rpcbind.socket avahi-daemon bluetooth minidlna openvpn) for i in "${SERVICES[@]}"; do systemctl disable --now $i done @@ -295,6 +298,7 @@ bootloader() { echo "GRUB_CMDLINE_LINUX_DEFAULT=\"quiet splash\"" >/etc/default/grub echo "GRUB_CMDLINE_LINUX=cryptdevice=UUID=$(/sbin/blkid | grep $BTRFS | cut -d '"' -f2):$ROOT_MAPPER_NAME root=UUID=$(/sbin/blkid | grep $ROOT_MAPPER_NAME | cut -d '"' -f4) rootflags=subvol@${ROOT_NAME} mitigations=-off" >>/etc/default/grub echo "GRUB_ENABLE_CRYPTODISK=y" >>/etc/default/grub + echo "GRUB_DISABLE_OS_PROBER=false" >>/etc/default/grub echo "GRUB_THEME=/boot/grub/themes/theme.txt" >>/etc/default/grub /sbin/grub-install --target=x86_64-efi --efi-directory=/boot/efi --bootloader-id=debian /sbin/update-grub @@ -451,11 +455,11 @@ services() { } server-config() { - cp -f ./smb.conf /etc/samba/ - cp- f ./minidlna.conf /etc/ - cp -f ./99-sysctl.conf /etc/sysctl.d/ - cp -f *.service /etc/systemd/system/ - cp -f exports /etc/ + cp -f etc/smb.conf /etc/samba/ + cp- f etc/minidlna.conf /etc/ + cp -f etc/99-sysctl.conf /etc/sysctl.d/ + cp -f systemd/*.service /etc/systemd/system/ + cp -f etc/exports /etc/ crontab >crontab SERVICES+=(minidlna vip containers pmie pmielogger nfs-server.service exim4 cockpit.socket redis-server smbd) @@ -500,6 +504,7 @@ show-help() { echo "./debian.sh wifi" echo "./debian.sh bootloader [disk]" echo "./debian.sh initialize [disk]" + echo "./debian.sh tar [disk]" echo "./debian.sh snapshot" echo "./debian.sh reomve-snapshot" echo "./debian.sh btrfs-tweaks" @@ -510,6 +515,8 @@ if [ "$1" = "install" ]; then install "$2" elif [ "$1" = "desktop" ]; then desktop +elif [ "$1" = "tar" ]; then + create-os-snapshots "$2" elif [ "$1" = "kernel-packages" ]; then kernel-packages elif [ "$1" = "upgrade-system" ]; then