File 0001-Test-if-snapper-exists-before-trying-to-ru... of Package jeos-firstboot

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-Test-if-snapper-exists-before-trying-to-run-it.patch of Package jeos-firstboot (Revision ea2e6ff136f3bb7fcc8e1770f63dcc13)

Currently displaying revision ea2e6ff136f3bb7fcc8e1770f63dcc13 , Show latest

From 045341427f6a96167b78972498c3cf8bc5dd866c Mon Sep 17 00:00:00 2001
From: Tuukka Pasanen <tuukka.pasanen@ilmi.fi>
Date: Fri, 15 Feb 2019 15:30:31 +0200
Subject: [PATCH] Test if snapper exists before trying to run it

---
 files/usr/lib/jeos-firstboot | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/files/usr/lib/jeos-firstboot b/files/usr/lib/jeos-firstboot
index 4fbe543..4bb0a77 100755
--- a/files/usr/lib/jeos-firstboot
+++ b/files/usr/lib/jeos-firstboot
@@ -456,15 +456,22 @@ if ! [ -f "$EFI_SYSTAB" ]; then
     run sed -i -e "s/LOADER_TYPE=.*/LOADER_TYPE=grub2/g" /etc/sysconfig/bootloader 
 fi
 
-# Run snapper to setup quota for btrfs
-run /usr/bin/snapper --no-dbus setup-quota || warn $"Could not setup quota for btrfs"
-
-#d --infobox "Creating snapshot ..." 3 40 || true
-#run snapper --no-dbus -v create -d "Initial Status" --userdata "important=yes" || d --msgbox "snapper failed" 0 0 || true
-if [ ! -e /.snapshots/2 ]; then
-    run create_snapshot 2 "Initial Status" "yes" || true
+# Test if snapper is available
+if [ -x /usr/bin/snapper ]
+then
+    # Run snapper to setup quota for btrfs
+    run /usr/bin/snapper --no-dbus setup-quota || warn $"Could not setup quota for btrfs"
+
+    #d --infobox "Creating snapshot ..." 3 40 || true
+    #run snapper --no-dbus -v create -d "Initial Status" --userdata "important=yes" || d --msgbox "snapper failed" 0 0 || true
+    if [ ! -e /.snapshots/2 ]; then
+        run create_snapshot 2 "Initial Status" "yes" || true
+    fi
+    if [ -x /usr/lib/snapper/plugins/grub ]
+    then
+        run /usr/lib/snapper/plugins/grub --refresh
+    fi
 fi
-run /usr/lib/snapper/plugins/grub --refresh
 
 if [ "$config_wireless" = "true" ]; then
     run ifdown $wlan_device 2>/dev/null || true
-- 
2.20.1

Places

File 0001-Test-if-snapper-exists-before-trying-to-run-it.patch of Package jeos-firstboot (Revision ea2e6ff136f3bb7fcc8e1770f63dcc13)

Places