improve backup and restore procedure #320
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,92 @@ | ||
| #!/bin/sh | ||
| # | ||
| # system-info.sh | ||
| # System info script gives an overview which packages and which versions are instaled | ||
| # | ||
| # Created by Blaubart, 2022-02-08 | ||
| # | ||
|
|
||
| # collect info of system and more installed packages | ||
| IMAGE_VERSION=$(cat /etc/os-release | grep VERSION_ID | cut -d '=' -f 2) | ||
| KERNEL_VERSION=$(uname -r) | ||
| XCSOAR_MAPS_VERSION=$(opkg list-installed xcsoar-maps* | cut -d '-' -f 4) | ||
| XCSOAR_MENU=$(opkg list-installed xcsoar-menu* | cut -d '-' -f 3) | ||
| IP_ETH0=$(ip route | grep eth0 | head -n 1 | cut -d ' ' -f 8) | ||
| MAC=`ip li|grep -A 1 eth0|tail -n 1|cut -d ' ' -f 6` | ||
| HOSTNAME=$(cat /etc/hostname) | ||
| IP_WLAN=$(ip route | grep wlan0 | head -n 1| cut -d ' ' -f 8) | ||
| I2C_TOOLS=$(opkg list-installed i2c-tools | cut -d '-' -f 3) | ||
| E2FSPROGS=$(opkg list-installed e2fsprogs | cut -d '-' -f 2) | ||
| USB_MODESWITCH=$(opkg list-installed usb-modeswitch | cut -d '-' -f 3) | ||
|
|
||
| # collect status of SSH, variod and sensord | ||
| if /bin/systemctl --quiet is-enabled dropbear.socket | ||
| then | ||
| SSH_STATUS=enabled | ||
| else | ||
| SSH_STATUS=disabled | ||
| fi | ||
|
|
||
| if /bin/systemctl --quiet is-enabled variod | ||
| then | ||
| VARIOD_STATUS=enabled | ||
| else | ||
| VARIOD_STATUS=disabled | ||
| fi | ||
|
|
||
| if /bin/systemctl --quiet is-enabled sensord | ||
| then | ||
| SENSORD_STATUS=enabled | ||
| else | ||
| SENSORD_STATUS=disabled | ||
| fi | ||
|
|
||
| #print info of system and packages | ||
| echo ' Image: '$IMAGE_VERSION | ||
| echo ' Kernel: '$KERNEL_VERSION | ||
|
|
||
| # collect info of installed packages, depending of testing or stable version is used | ||
| if [ -n "$(opkg list-installed xcsoar-testing)" ] | ||
| then | ||
| XCSOAR_VERSION=$(opkg list-installed xcsoar-testing | cut -d ' - ' -f 3) | ||
| echo ' XCSoar-testing: '$XCSOAR_VERSION | ||
| else | ||
| XCSOAR_VERSION=$(opkg list-installed xcsoar | cut -d '-' -f 2) | ||
| echo ' XCSoar:'$XCSOAR_VERSION | ||
| fi | ||
|
|
||
| echo ' Maps:'$XCSOAR_MAPS_VERSION | ||
| echo ' Menu:'$XCSOAR_MENU | ||
|
|
||
| if [ -n "$(opkg list-installed sensord-testing)" ] | ||
| then | ||
| SENSORD_VERSION=$(opkg list-installed sensord-testing | cut -d ' - ' -f 3) | ||
| echo ' sensord-testing: '$SENSORD_VERSION | ||
| else | ||
| SENSORD_VERSION=$(opkg list-installed sensord | cut -d '-' -f 2) | ||
| echo ' sensord:'$SENSORD_VERSION | ||
| fi | ||
|
|
||
| if [ -n "$(opkg list-installed variod-testing)" ] | ||
| then | ||
| VARIOD_VERSION=$(opkg list-installed variod-testing | cut -d ' - ' -f 3) | ||
| echo ' variod-testing: '$VARIOD_VERSION | ||
| else | ||
| VARIOD_VERSION=$(opkg list-installed variod | cut -d '-' -f 2) | ||
| echo ' variod:'$VARIOD_VERSION | ||
| fi | ||
|
|
||
| echo ' IP eth0: '$IP_ETH0 | ||
| echo ' MAC-address eth0: '$MAC | ||
| echo ' Hostname: '$HOSTNAME | ||
| echo ' IP wlan0: '$IP_WLAN | ||
| echo -e '\n' | ||
| echo ' supplementary packages that are not included\n in every image:' | ||
| echo ' i2c-tools:'$I2C_TOOLS | ||
| echo ' e2fsprogs:'$E2FSPROGS | ||
| echo ' usb-modeswitch:'$USB_MODESWITCH | ||
| echo -e '\n' | ||
| echo ' Status of SSH, variod and sensord:' | ||
| echo ' SSH is '$SSH_STATUS | ||
| echo ' variod is '$VARIOD_STATUS | ||
| echo ' sensord is '$SENSORD_STATUS | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,222 @@ | ||
| #!/bin/sh | ||
| # | ||
| # transfer-xcsoar.sh | ||
| # System backup transfer script to and from usbstick for Openvario and XCSoar | ||
| # | ||
| # Created by lordfolken 2022-02-08 | ||
| # Enhanced by 7lima & Blaubart 2022-06-19 | ||
| # | ||
| # This backup and restore script stores all XCSoar settings and relevant | ||
| # Openvario settings like: | ||
| # | ||
| # -brightness of the display | ||
| # -rotation | ||
| # -touch screen calibration | ||
| # -language settings | ||
| # -dropbear settings | ||
| # -SSH, variod and sensord status | ||
| # | ||
| # backups are stored at USB stick at: | ||
| # openvario/backup/<MAC address of eth0>/ | ||
| # So you can store backups from more than one OV on the same stick! | ||
|
|
||
| echo ' [==========] Starting' | ||
| echo ' [#=========] Wait until "DONE !!" appears before you exit!' | ||
|
|
||
| # Provident background system buffer sync to help later syncs finish quicker | ||
| sync& | ||
|
|
||
| # Path where the USB stick is mounted | ||
| USB_PATH=/usb/usbstick | ||
|
|
||
| # XCSoar settings path | ||
| export XCSOAR_PATH=/home/root/.xcsoar | ||
|
|
||
| # XCSoar upload path | ||
| XCSOAR_UPLOAD_PATH=openvario/upload/xcsoar | ||
|
|
||
| # Backup path within the USB stick | ||
| BACKUP=openvario/backup | ||
|
|
||
| # MAC address of the Ethernet device eth0 to do a separate backup | ||
| MAC=`ip li|grep -A 1 eth0|tail -n 1|cut -d ' ' -f 6|sed -e s/:/-/g` | ||
|
|
||
| # Restore Shell Function: calls rsync with unified options. | ||
| # Copies all files and dirs from source recursively. Parameters: | ||
| # $1 source | ||
| # $2 target | ||
| # $3 comment about type of items | ||
| restore() { | ||
| if | ||
| # We use --checksum here due to cubieboards not having an rtc clock | ||
| rsync --recursive --mkpath --checksum --quiet --progress "$1" "$2" | ||
| test ${RSYNC_EXIT:=$?} -eq 0 | ||
| then | ||
| echo " [####======] All $3 files have been restored." | ||
| else | ||
| >&2 echo " An rsync error $RSYNC_EXIT has occurred!" | ||
| fi | ||
| # Provident system buffer sync to help later syncs finish quicker | ||
| sync& | ||
| } | ||
|
|
||
| case `basename "$0"` in | ||
| backup-system.sh) | ||
| echo ' [##========] System check ...' | ||
|
|
||
| # Store SSH status | ||
| if /bin/systemctl --quiet is-enabled dropbear.socket | ||
| then echo enabled | ||
| elif /bin/systemctl --quiet is-active dropbear.socket | ||
| then echo temporary | ||
| else echo disabled | ||
| fi > /home/root/ssh-status | ||
|
Comment on lines
+68
to
+73
There was a problem hiding this comment. It's a different compact indentation style deliberately used here.
Comment on lines
+68
to
+73
There was a problem hiding this comment. It's a different compact indentation style deliberately used here. |
||
|
|
||
| # Store variod and sensord status | ||
| for DAEMON in variod sensord | ||
| do | ||
| if /bin/systemctl --quiet is-enabled $DAEMON | ||
| then echo enabled | ||
| else echo disabled | ||
| fi > /home/root/$DAEMON-status | ||
| done | ||
|
|
||
| # Store if profiles are protected or not | ||
| if opkg list-installed | grep "e2fsprogs" > /dev/null; | ||
|
There was a problem hiding this comment. This is not so portable. Please do a stat command to the executable. There was a problem hiding this comment. Querying the version of the daemons by a "opkg list-installed" query is not as portable as desired, yes. |
||
| then | ||
| PROFILE= find "$XCSOAR_PATH" -maxdepth 1 -type f -name '*.prf' -exec sh -c ' | ||
| for PROFILE; | ||
| do | ||
| mkdir -p /home/root/profile-settings | ||
| PROFILE_FILE=`basename "$PROFILE"` | ||
| PROFILE_NAME=${PROFILE_FILE%.*} | ||
| if lsattr "$PROFILE" | cut -b 5 | fgrep -q i; | ||
| then echo protected | ||
| else echo unprotected | ||
| fi > /home/root/profile-settings/$PROFILE_NAME | ||
| done | ||
| ' -- {} + | ||
| fi | ||
|
|
||
| # Copy brightness setting | ||
| cat /sys/class/backlight/lcd/brightness > /home/root/brightness | ||
|
|
||
|
There was a problem hiding this comment. If we ever implement some dynamic brightness setting, this would write the current (adapted) brightness into the backup, instead of a configured value. Where is the configured value saved? |
||
| echo ' [####======] Starting backup ...' | ||
| # Copy all directories and files from list below to backup directory recursively. | ||
| # We use --checksum here due to cubieboards not having an rtc clock | ||
| if | ||
| rsync --files-from - --archive --recursive --quiet \ | ||
| --relative --mkpath --checksum --safe-links \ | ||
| --progress \ | ||
| / "$USB_PATH/$BACKUP/$MAC"/ <<-LISTE | ||
| /etc/locale.conf | ||
| /etc/udev/rules.d/libinput-ts.rules | ||
| /etc/pointercal | ||
| /etc/dropbear | ||
| /home/root | ||
| /opt/conf | ||
| /var/lib/connman | ||
| /boot/config.uEnv | ||
| LISTE | ||
| test ${RSYNC_EXIT:=$?} -eq 0 | ||
| then | ||
| echo ' [######====] All files and settings have been backed up.' | ||
| else | ||
| >&2 echo " An rsync error $RSYNC_EXIT has occurred!" | ||
| fi;; | ||
|
|
||
| upload-xcsoar.sh) | ||
| echo ' [##========] Starting upload of XCSoar files ...' | ||
| # Call Shell Function defined above | ||
| if | ||
| # We use --checksum here due to cubieboards not having an rtc clock | ||
| rsync --recursive --mkpath --checksum --quiet --progress "$USB_PATH/$XCSOAR_UPLOAD_PATH"/ "$XCSOAR_PATH" | ||
| test ${RSYNC_EXIT:=$?} -eq 0 | ||
| then | ||
| echo " [####======] All XCSoar files have been uploaded." | ||
| else | ||
| >&2 echo " An rsync error $RSYNC_EXIT has occurred!" | ||
| fi | ||
| # Provident system buffer sync to help later syncs finish quicker | ||
| sync&;; | ||
|
|
||
| restore-xcsoar.sh) | ||
| echo ' [##========] Starting restore of XCSoar ...' | ||
| # Call Shell Function defined above | ||
| restore "$USB_PATH/$BACKUP/$MAC/$XCSOAR_PATH"/ "$XCSOAR_PATH"/ XCSoar;; | ||
|
|
||
| restore-system.sh) | ||
| echo ' [##========] Starting restore ...' | ||
|
|
||
| # Eliminate /etc/opkg backup in case it's present | ||
| rm -rf "$USB_PATH/$BACKUP/$MAC"/etc/opkg/ | ||
|
|
||
| # Call Shell Function defined above | ||
| restore "$USB_PATH/$BACKUP/$MAC"/ / "Openvario and XCSoar" | ||
|
|
||
| # Restore SSH status | ||
| case `cat /home/root/ssh-status` in | ||
| enabled) | ||
| /bin/systemctl enable --quiet --now dropbear.socket | ||
|
There was a problem hiding this comment. enabling does not start the dropbear daemon. This needs a start in addtion. |
||
| echo " [####======] SSH has been enabled permanently.";; | ||
| temporary) | ||
| /bin/systemctl disable --quiet --now dropbear.socket | ||
| /bin/systemctl start --quiet --now dropbear.socket | ||
| echo " [####======] SSH has been enabled temporarily.";; | ||
| disabled) | ||
| /bin/systemctl disable --quiet --now dropbear.socket | ||
| echo " [####======] SSH has been disabled.";; | ||
| esac | ||
|
|
||
| # Restore variod and sensord status | ||
| for DAEMON in variod sensord | ||
| do | ||
| case `cat /home/root/$DAEMON-status` in | ||
| enabled) /bin/systemctl enable --quiet --now $DAEMON | ||
| echo " [#####=====] $DAEMON has been enabled.";; | ||
| disabled) /bin/systemctl disable --quiet --now $DAEMON | ||
| echo " [#####=====] $DAEMON has been disabled.";; | ||
| esac | ||
| done | ||
|
|
||
| # Restore protection for profiles if necessary | ||
| if opkg list-installed | grep "e2fsprogs" > /dev/null; | ||
| then | ||
| PROFILE= find "$XCSOAR_PATH" -maxdepth 1 -type f -name '*.prf' -exec sh -c ' | ||
| for PROFILE; | ||
| do | ||
| PROFILE_FILE=`basename "$PROFILE"` | ||
| PROFILE_NAME=${PROFILE_FILE%.*} | ||
| case `cat /home/root/profile-settings/"$PROFILE_NAME"` in | ||
| protected) chattr +i "$XCSOAR_PATH"/"$PROFILE_NAME.prf" | ||
| echo " [######====] $PROFILE_NAME.prf has been protected.";; | ||
| unprotected) echo " [######====] $PROFILE_NAME.prf is still unprotected.";; | ||
| esac | ||
| done | ||
| ' -- {} + | ||
| else | ||
| PROFILE= find "$XCSOAR_PATH" -maxdepth 1 -type f -name '*.prf' -exec sh -c ' | ||
| for PROFILE; | ||
| do | ||
| PROFILE_FILE=`basename "$PROFILE"` | ||
| PROFILE_NAME=${PROFILE_FILE%.*} | ||
| case `cat /home/root/profile-settings/"$PROFILE_NAME"` in | ||
| protected) echo ' You try to protect $PROFILE_NAME.prf, but chattr is not installed!';; | ||
| esac | ||
| done | ||
| ' -- {} + | ||
| fi | ||
|
|
||
| # Restore brightness setting | ||
| cat /home/root/brightness > /sys/class/backlight/lcd/brightness | ||
| echo " [#######===] brightness setting has been restored.";; | ||
| *) | ||
| >&2 echo 'call as backup-system.sh, upload-xcsoar.sh, restore-xcsoar.sh or restore-system.sh' | ||
| exit 1;; | ||
| esac | ||
|
|
||
| # Sync the system buffer to make sure all data is on disk | ||
| echo ' [########==] Please wait a moment, synchronization is not yet complete!' | ||
| sync | ||
| echo ' [##########] DONE !! ---------------------------------------------------' | ||
| exit $RSYNC_EXIT | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This commit does three things:
Doing 3 distinct things in 1 commit obscures the code changes, because one cannot see what was changed; the commitdiff is "remove 20 lines here, add 100 lines over there", but no diff possible.