import CS rear-2.6-26.el9
This commit is contained in:
parent
b577b6ebc5
commit
ec50bb02a5
301
SOURCES/rear-improve-layout-guide.patch
Normal file
301
SOURCES/rear-improve-layout-guide.patch
Normal file
@ -0,0 +1,301 @@
|
||||
diff --git a/doc/user-guide/06-layout-configuration.adoc b/doc/user-guide/06-layout-configuration.adoc
|
||||
index 88ba0420f..680d69640 100644
|
||||
--- a/doc/user-guide/06-layout-configuration.adoc
|
||||
+++ b/doc/user-guide/06-layout-configuration.adoc
|
||||
@@ -35,22 +35,22 @@ Layout information is stored in +/var/lib/rear/layout/disklayout.conf+. The term
|
||||
Consider the information from the following system as an example:
|
||||
----------------------------------
|
||||
disk /dev/sda 160041885696 msdos
|
||||
-# disk /dev/sdb 320072933376 msdos
|
||||
-# disk /dev/sdc 1999696297984 msdos
|
||||
+#disk /dev/sdb 320072933376 msdos
|
||||
+#disk /dev/sdc 1999696297984 msdos
|
||||
part /dev/sda 209682432 32768 primary boot /dev/sda1
|
||||
part /dev/sda 128639303680 209719296 primary lvm /dev/sda2
|
||||
part /dev/sda 31192862720 128849022976 primary none /dev/sda3
|
||||
-# part /dev/sdb 162144912384 32256 primary none /dev/sdb1
|
||||
-# part /dev/sdb 152556666880 162144944640 primary none /dev/sdb2
|
||||
-# part /dev/sdb 5371321856 314701611520 primary boot /dev/sdb3
|
||||
-# part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
-# part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
-# lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
+#part /dev/sdb 162144912384 32256 primary none /dev/sdb1
|
||||
+#part /dev/sdb 152556666880 162144944640 primary none /dev/sdb2
|
||||
+#part /dev/sdb 5371321856 314701611520 primary boot /dev/sdb3
|
||||
+#part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
+#part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
+#lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
lvmdev /dev/system /dev/mapper/disk N4Hpdc-DkBP-Hdm6-Z6FH-VixZ-7tTb-LiRt0w 251244544
|
||||
-# lvmgrp /dev/backup 4096 220764 904249344
|
||||
+#lvmgrp /dev/backup 4096 220764 904249344
|
||||
lvmgrp /dev/system 4096 30669 125620224
|
||||
-# lvmvol /dev/backup backup 12800 104857600
|
||||
-# lvmvol /dev/backup externaltemp 38400 314572800
|
||||
+#lvmvol /dev/backup backup 12800 104857600
|
||||
+#lvmvol /dev/backup externaltemp 38400 314572800
|
||||
lvmvol /dev/system root 2560 20971520
|
||||
lvmvol /dev/system home 5120 41943040
|
||||
lvmvol /dev/system var 2560 20971520
|
||||
@@ -81,45 +81,7 @@ It's easy to see that there are 3 disks attached to the system. +/dev/sda+ is th
|
||||
Relax-and-Recover has reasonable defaults when creating the recovery
|
||||
information. It has commented out the two external disks and any
|
||||
component that's part of it. The reason is that no mounted filesystem
|
||||
-uses these two disks. After all, you don't want to recreate your
|
||||
-backup disk when you're recovering your system.
|
||||
-
|
||||
-If we mount the filesystem on +/dev/mapper/backup-backup+ on +/media/backup+,
|
||||
-Relax-and-Recover will think that it's necessary to recreate the filesystem:
|
||||
-----------------------------------
|
||||
-disk /dev/sda 160041885696 msdos
|
||||
-# disk /dev/sdb 320072933376 msdos
|
||||
-disk /dev/sdc 1999696297984 msdos
|
||||
-part /dev/sda 209682432 32768 primary boot /dev/sda1
|
||||
-part /dev/sda 128639303680 209719296 primary lvm /dev/sda2
|
||||
-part /dev/sda 31192862720 128849022976 primary none /dev/sda3
|
||||
-# part /dev/sdb 162144912384 32256 primary none /dev/sdb1
|
||||
-# part /dev/sdb 152556666880 162144944640 primary none /dev/sdb2
|
||||
-# part /dev/sdb 5371321856 314701611520 primary boot /dev/sdb3
|
||||
-part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
-part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
-lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
-lvmdev /dev/system /dev/mapper/disk N4Hpdc-DkBP-Hdm6-Z6FH-VixZ-7tTb-LiRt0w 251244544
|
||||
-lvmgrp /dev/backup 4096 220764 904249344
|
||||
-lvmgrp /dev/system 4096 30669 125620224
|
||||
-lvmvol /dev/backup backup 12800 104857600
|
||||
-lvmvol /dev/backup externaltemp 38400 314572800
|
||||
-lvmvol /dev/system root 2560 20971520
|
||||
-lvmvol /dev/system home 5120 41943040
|
||||
-lvmvol /dev/system var 2560 20971520
|
||||
-lvmvol /dev/system swap 512 4194304
|
||||
-lvmvol /dev/system vmxfs 7680 62914560
|
||||
-lvmvol /dev/system kvm 5000 40960000
|
||||
-fs /dev/mapper/system-root / ext4 uuid=dbb0c0d4-7b9a-40e2-be83-daafa14eff6b label= blocksize=4096 reserved_blocks=131072 max_mounts=21 check_interval=180d options=rw,commit=0
|
||||
-fs /dev/mapper/system-home /home ext4 uuid=e9310015-6043-48cd-a37d-78dbfdba1e3b label= blocksize=4096 reserved_blocks=262144 max_mounts=38 check_interval=180d options=rw,commit=0
|
||||
-fs /dev/mapper/system-var /var ext4 uuid=a12bb95f-99f2-42c6-854f-1cb3f144d662 label= blocksize=4096 reserved_blocks=131072 max_mounts=23 check_interval=180d options=rw,commit=0
|
||||
-fs /dev/mapper/system-vmxfs /vmware xfs uuid=7457d2ab-8252-4f41-bab6-607316259975 label= options=rw,noatime
|
||||
-fs /dev/mapper/system-kvm /kvm ext4 uuid=173ab1f7-8450-4176-8cf7-c09b47f5e3cc label= blocksize=4096 reserved_blocks=256000 max_mounts=21 check_interval=180d options=rw,noatime,commit=0
|
||||
-fs /dev/sda1 /boot ext3 uuid=f6b08566-ea5e-46f9-8f73-5e8ffdaa7be6 label= blocksize=1024 reserved_blocks=10238 max_mounts=35 check_interval=180d options=rw,commit=0
|
||||
-fs /dev/mapper/backup-backup /media/backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
-swap /dev/mapper/system-swap uuid=9f347fc7-1605-4788-98fd-fca828beedf1 label=
|
||||
-crypt /dev/mapper/disk /dev/sda2 cipher=aes-xts-plain hash=sha1 uuid=beafe67c-d9a4-4992-80f1-e87791a543bb
|
||||
-----------------------------------
|
||||
+uses these two disks.
|
||||
|
||||
This behavior is controlled by the +AUTOEXCLUDE_DISKS=y+ parameter in
|
||||
+default.conf+. If we unset it in the local configuration, Relax-and-Recover
|
||||
@@ -131,61 +93,81 @@ multipath disks. Typically, they are part of the SAN disaster recovery
|
||||
strategy. However, there can be cases where you want to recover them. The
|
||||
information is retained in +disklayout.conf+.
|
||||
|
||||
-=== Manual excludes
|
||||
-It seems prudent to prevent the external drives from ever being backed-up or overwritten. The default configuration contains these lines:
|
||||
+Some filesystems are excluded from the layout file by default if their
|
||||
+mountpoints are located under certain directories. This behavior is
|
||||
+controlled by the +AUTOEXCLUDE_PATH+ variable. It is an array of
|
||||
+paths. If a mountpoint of a filesystem is under one of the paths, the
|
||||
+filesystem is excluded. The default value includes +/media+, +/mnt+
|
||||
+and +/tmp+. See +default.conf+ for the full list. Note that if one of
|
||||
+the paths is itself a mountpoint, the filesystem is not excluded. So,
|
||||
+if +/media+ is a mounted filesystem, it will not be excluded, but if
|
||||
+we mount the +/dev/mapper/backup-backup+ filesystem on
|
||||
++/media/backup+, it will get excluded, as the mountpoint is under
|
||||
++/media+.
|
||||
+
|
||||
+If we mount the filesystem on +/dev/mapper/backup-backup+ on +/backup+,
|
||||
+Relax-and-Recover will think that it's necessary to recreate the filesystem:
|
||||
----------------------------------
|
||||
-# Exclude components from being backed up, recreation information is active
|
||||
-EXCLUDE_BACKUP=()
|
||||
-
|
||||
-# Exclude components during component recreation
|
||||
-# will be added to EXCLUDE_BACKUP (it is not backed up)
|
||||
-# recreation information gathered, but commented out
|
||||
-EXCLUDE_RECREATE=()
|
||||
-
|
||||
-# Exclude components during the backup restore phase
|
||||
-# only used to exclude files from the restore.
|
||||
-EXCLUDE_RESTORE=()
|
||||
+disk /dev/sdc 1999696297984 msdos
|
||||
+...
|
||||
+part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
+part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
+lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
+...
|
||||
+lvmgrp /dev/backup 4096 220764 904249344
|
||||
+...
|
||||
+lvmvol /dev/backup backup 12800 104857600
|
||||
+lvmvol /dev/backup externaltemp 38400 314572800
|
||||
+...
|
||||
+fs /dev/mapper/backup-backup /backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
----------------------------------
|
||||
|
||||
-To prevent an inadvertently mounted backup filesystem being added to the restore list, the easiest way is to add the filesystem to the +EXCLUDE_RECREATE+ array.
|
||||
-----------------------------------
|
||||
-EXCLUDE_RECREATE+=( "fs:/media/backup" )
|
||||
+=== Manual excludes
|
||||
+In this example, the external drive +/dev/sdc+ contains a volume group
|
||||
+used for backups outside Relax-and-Recover. It is assumed that one
|
||||
+does not want to overwrite and recreate the content of the backup disk
|
||||
+when recovering the system, but one expects the backup disk to survive
|
||||
+the recovery unchanged, and that one also does not want
|
||||
+Relax-and-Recover to make a backup of its content. (Note that
|
||||
+excluding a filesystem from the layout file also excludes the files in
|
||||
+the filesystem from the backup when using a supported backup method,
|
||||
+which is what we want in this case.) One thus needs to
|
||||
+exclude the components on the disk from the layout file.
|
||||
+A generic mechanism for doing this is the +EXCLUDE_RECREATE+
|
||||
+variable. It can contain a list of storage components that will be
|
||||
+excluded from the layout (will be present in the layout file, but
|
||||
+commented out) recursively together with their descendants (components
|
||||
+that depend on the excluded component, like a filesystem on the
|
||||
+underlying logical volume). Each component in the list corresponds to
|
||||
+a component in the layout file, but the syntax is different. To
|
||||
+specify a mounted filesystem, use the +fs:+ prefix:
|
||||
++fs:+<mountpoint>. To specify swap, use the +swap:+ prefix. The syntax
|
||||
+to specify a volume group to exclude (together with all its logical
|
||||
+volumes and filesystems on them) is +/dev/+<volume group name>. Consult
|
||||
+the +/var/lib/rear/layout/disktodo.conf+ file created together with
|
||||
+the layout file for the full list of components in a compatible
|
||||
+syntax.
|
||||
+
|
||||
+To prevent the mounted backup filesystem from being added to
|
||||
+the layout file and recreated, one may add the filesystem to the +EXCLUDE_RECREATE+ array.
|
||||
+----------------------------------
|
||||
+EXCLUDE_RECREATE+=( "fs:/backup" )
|
||||
----------------------------------
|
||||
|
||||
The layout file is as expected:
|
||||
----------------------------------
|
||||
-disk /dev/sda 160041885696 msdos
|
||||
-# disk /dev/sdb 320072933376 msdos
|
||||
-# disk /dev/sdc 1999696297984 msdos
|
||||
-part /dev/sda 209682432 32768 primary boot /dev/sda1
|
||||
-part /dev/sda 128639303680 209719296 primary lvm /dev/sda2
|
||||
-part /dev/sda 31192862720 128849022976 primary none /dev/sda3
|
||||
-# part /dev/sdb 162144912384 32256 primary none /dev/sdb1
|
||||
-# part /dev/sdb 152556666880 162144944640 primary none /dev/sdb2
|
||||
-# part /dev/sdb 5371321856 314701611520 primary boot /dev/sdb3
|
||||
-# part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
-# part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
-# lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
-lvmdev /dev/system /dev/mapper/disk N4Hpdc-DkBP-Hdm6-Z6FH-VixZ-7tTb-LiRt0w 251244544
|
||||
-# lvmgrp /dev/backup 4096 220764 904249344
|
||||
-lvmgrp /dev/system 4096 30669 125620224
|
||||
-# lvmvol /dev/backup backup 12800 104857600
|
||||
-# lvmvol /dev/backup externaltemp 38400 314572800
|
||||
-lvmvol /dev/system root 2560 20971520
|
||||
-lvmvol /dev/system home 5120 41943040
|
||||
-lvmvol /dev/system var 2560 20971520
|
||||
-lvmvol /dev/system swap 512 4194304
|
||||
-lvmvol /dev/system vmxfs 7680 62914560
|
||||
-lvmvol /dev/system kvm 5000 40960000
|
||||
-fs /dev/mapper/system-root / ext4 uuid=dbb0c0d4-7b9a-40e2-be83-daafa14eff6b label= blocksize=4096 reserved_blocks=131072 max_mounts=21 check_interval=180d options=rw,commit=0
|
||||
-fs /dev/mapper/system-home /home ext4 uuid=e9310015-6043-48cd-a37d-78dbfdba1e3b label= blocksize=4096 reserved_blocks=262144 max_mounts=38 check_interval=180d options=rw,commit=0
|
||||
-fs /dev/mapper/system-var /var ext4 uuid=a12bb95f-99f2-42c6-854f-1cb3f144d662 label= blocksize=4096 reserved_blocks=131072 max_mounts=23 check_interval=180d options=rw,commit=0
|
||||
-fs /dev/mapper/system-vmxfs /vmware xfs uuid=7457d2ab-8252-4f41-bab6-607316259975 label= options=rw,noatime
|
||||
-fs /dev/mapper/system-kvm /kvm ext4 uuid=173ab1f7-8450-4176-8cf7-c09b47f5e3cc label= blocksize=4096 reserved_blocks=256000 max_mounts=21 check_interval=180d options=rw,noatime,commit=0
|
||||
-fs /dev/sda1 /boot ext3 uuid=f6b08566-ea5e-46f9-8f73-5e8ffdaa7be6 label= blocksize=1024 reserved_blocks=10238 max_mounts=35 check_interval=180d options=rw,commit=0
|
||||
-# fs /dev/mapper/backup-backup /media/backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
-swap /dev/mapper/system-swap uuid=9f347fc7-1605-4788-98fd-fca828beedf1 label=
|
||||
-crypt /dev/mapper/disk /dev/sda2 cipher=aes-xts-plain hash=sha1 uuid=beafe67c-d9a4-4992-80f1-e87791a543bb
|
||||
+#disk /dev/sdc 1999696297984 msdos
|
||||
+...
|
||||
+#part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
+#part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
+#lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
+...
|
||||
+#lvmgrp /dev/backup 4096 220764 904249344
|
||||
+...
|
||||
+#lvmvol /dev/backup backup 12800 104857600
|
||||
+#lvmvol /dev/backup externaltemp 38400 314572800
|
||||
+...
|
||||
+#fs /dev/mapper/backup-backup /backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
----------------------------------
|
||||
|
||||
Another approach would be to exclude the backup volume group. This is achieved by adding this line to the local configuration:
|
||||
@@ -295,22 +277,22 @@ checking the disklayout file, we'd better do that.
|
||||
----------------------------------
|
||||
#? 1
|
||||
disk /dev/sdb 160041885696 msdos
|
||||
-# disk _REAR1_ 320072933376 msdos
|
||||
-# disk /dev/sdc 1999696297984 msdos
|
||||
+#disk _REAR1_ 320072933376 msdos
|
||||
+#disk /dev/sdc 1999696297984 msdos
|
||||
part /dev/sdb 209682432 32768 primary boot /dev/sdb1
|
||||
part /dev/sdb -20916822016 209719296 primary lvm /dev/sdb2
|
||||
part /dev/sdb 31192862720 128849022976 primary none /dev/sdb3
|
||||
-# part _REAR1_ 162144912384 32256 primary none _REAR1_1
|
||||
-# part _REAR1_ 152556666880 162144944640 primary none _REAR1_2
|
||||
-# part _REAR1_ 5371321856 314701611520 primary boot _REAR1_3
|
||||
-# part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
-# part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
-# lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
+#part _REAR1_ 162144912384 32256 primary none _REAR1_1
|
||||
+#part _REAR1_ 152556666880 162144944640 primary none _REAR1_2
|
||||
+#part _REAR1_ 5371321856 314701611520 primary boot _REAR1_3
|
||||
+#part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
+#part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
+#lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
lvmdev /dev/system /dev/mapper/disk N4Hpdc-DkBP-Hdm6-Z6FH-VixZ-7tTb-LiRt0w 251244544
|
||||
-# lvmgrp /dev/backup 4096 220764 904249344
|
||||
+#lvmgrp /dev/backup 4096 220764 904249344
|
||||
lvmgrp /dev/system 4096 30669 125620224
|
||||
-# lvmvol /dev/backup backup 12800 104857600
|
||||
-# lvmvol /dev/backup externaltemp 38400 314572800
|
||||
+#lvmvol /dev/backup backup 12800 104857600
|
||||
+#lvmvol /dev/backup externaltemp 38400 314572800
|
||||
lvmvol /dev/system root 2560 20971520
|
||||
lvmvol /dev/system home 5120 41943040
|
||||
lvmvol /dev/system var 2560 20971520
|
||||
@@ -323,7 +305,7 @@ fs /dev/mapper/system-var /var ext4 uuid=a12bb95f-99f2-42c6-854f-1cb3f144d662 la
|
||||
fs /dev/mapper/system-vmxfs /vmware xfs uuid=7457d2ab-8252-4f41-bab6-607316259975 label= options=rw,noatime
|
||||
fs /dev/mapper/system-kvm /kvm ext4 uuid=173ab1f7-8450-4176-8cf7-c09b47f5e3cc label= blocksize=4096 reserved_blocks=256000 max_mounts=21 check_interval=180d options=rw,noatime,commit=0
|
||||
fs /dev/sdb1 /boot ext3 uuid=f6b08566-ea5e-46f9-8f73-5e8ffdaa7be6 label= blocksize=1024 reserved_blocks=10238 max_mounts=35 check_interval=180d options=rw,commit=0
|
||||
-# fs /dev/mapper/backup-backup /media/backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
+#fs /dev/mapper/backup-backup /backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
swap /dev/mapper/system-swap uuid=9f347fc7-1605-4788-98fd-fca828beedf1 label=
|
||||
crypt /dev/mapper/disk /dev/sdb2 cipher=aes-xts-plain hash=sha1 uuid=beafe67c-d9a4-4992-80f1-e87791a543bb
|
||||
|
||||
@@ -344,22 +326,22 @@ The /kvm and /vmware filesystems are quite big. We don't care about them, so jus
|
||||
The resulting layout file looks like this:
|
||||
----------------------------------
|
||||
disk /dev/sdb 160041885696 msdos
|
||||
-# disk _REAR1_ 320072933376 msdos
|
||||
-# disk /dev/sdc 1999696297984 msdos
|
||||
+#disk _REAR1_ 320072933376 msdos
|
||||
+#disk /dev/sdc 1999696297984 msdos
|
||||
part /dev/sdb 209682432 32768 primary boot /dev/sdb1
|
||||
part /dev/sdb -20916822016 209719296 primary lvm /dev/sdb2
|
||||
part /dev/sdb 31192862720 128849022976 primary none /dev/sdb3
|
||||
-# part _REAR1_ 162144912384 32256 primary none _REAR1_1
|
||||
-# part _REAR1_ 152556666880 162144944640 primary none _REAR1_2
|
||||
-# part _REAR1_ 5371321856 314701611520 primary boot _REAR1_3
|
||||
-# part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
-# part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
-# lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
+#part _REAR1_ 162144912384 32256 primary none _REAR1_1
|
||||
+#part _REAR1_ 152556666880 162144944640 primary none _REAR1_2
|
||||
+#part _REAR1_ 5371321856 314701611520 primary boot _REAR1_3
|
||||
+#part /dev/sdc 1073741824000 1048576 primary boot /dev/sdc1
|
||||
+#part /dev/sdc 925953425408 1073742872576 primary lvm /dev/sdc2
|
||||
+#lvmdev /dev/backup /dev/sdc2 cJp4Mt-Vkgv-hVlr-wTMb-0qeA-FX7j-3C60p5 1808502784
|
||||
lvmdev /dev/system /dev/mapper/disk N4Hpdc-DkBP-Hdm6-Z6FH-VixZ-7tTb-LiRt0w 251244544
|
||||
-# lvmgrp /dev/backup 4096 220764 904249344
|
||||
+#lvmgrp /dev/backup 4096 220764 904249344
|
||||
lvmgrp /dev/system 4096 30669 125620224
|
||||
-# lvmvol /dev/backup backup 12800 104857600
|
||||
-# lvmvol /dev/backup externaltemp 38400 314572800
|
||||
+#lvmvol /dev/backup backup 12800 104857600
|
||||
+#lvmvol /dev/backup externaltemp 38400 314572800
|
||||
lvmvol /dev/system root 2560 20971520
|
||||
lvmvol /dev/system home 5120 41943040
|
||||
lvmvol /dev/system var 2560 20971520
|
||||
@@ -372,7 +354,7 @@ fs /dev/mapper/system-var /var ext4 uuid=a12bb95f-99f2-42c6-854f-1cb3f144d662 la
|
||||
#fs /dev/mapper/system-vmxfs /vmware xfs uuid=7457d2ab-8252-4f41-bab6-607316259975 label= options=rw,noatime
|
||||
#fs /dev/mapper/system-kvm /kvm ext4 uuid=173ab1f7-8450-4176-8cf7-c09b47f5e3cc label= blocksize=4096 reserved_blocks=256000 max_mounts=21 check_interval=180d options=rw,noatime,commit=0
|
||||
fs /dev/sdb1 /boot ext3 uuid=f6b08566-ea5e-46f9-8f73-5e8ffdaa7be6 label= blocksize=1024 reserved_blocks=10238 max_mounts=35 check_interval=180d options=rw,commit=0
|
||||
-# fs /dev/mapper/backup-backup /media/backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
+#fs /dev/mapper/backup-backup /backup ext4 uuid=da20354a-dc4c-4bef-817c-1c92894bb002 label= blocksize=4096 reserved_blocks=655360 max_mounts=24 check_interval=180d options=rw
|
||||
swap /dev/mapper/system-swap uuid=9f347fc7-1605-4788-98fd-fca828beedf1 label=
|
||||
crypt /dev/mapper/disk /dev/sdb2 cipher=aes-xts-plain hash=sha1 uuid=beafe67c-d9a4-4992-80f1-e87791a543bb
|
||||
----------------------------------
|
||||
25
SOURCES/rear-multipath-bios-grub.patch
Normal file
25
SOURCES/rear-multipath-bios-grub.patch
Normal file
@ -0,0 +1,25 @@
|
||||
commit 6289aae51d60d0ce326913f3fc30f5325abb483d
|
||||
Author: Renaud Métrich <1163635+rmetrich@users.noreply.github.com>
|
||||
Date: Fri Oct 25 09:14:50 2024 +0200
|
||||
|
||||
Make get_disklabel_type() also work for 'multipath' devices (#3334)
|
||||
|
||||
Without this fix, get_disklabel_type() used to find a disk to install GRUB on
|
||||
was returning nothing when the disk was a multipath device.
|
||||
The reason is that then the line in disklayout.conf starts with 'multipath'
|
||||
but ReaR had searched for 'disk' only. Now it also searches for 'multipath'.
|
||||
See https://github.com/rear/rear/pull/3334
|
||||
|
||||
diff --git a/usr/share/rear/lib/layout-functions.sh b/usr/share/rear/lib/layout-functions.sh
|
||||
index 90b16cb20..0763963de 100644
|
||||
--- a/usr/share/rear/lib/layout-functions.sh
|
||||
+++ b/usr/share/rear/lib/layout-functions.sh
|
||||
@@ -529,7 +529,7 @@ function get_disklabel_type () {
|
||||
|
||||
disk=''
|
||||
|
||||
- read component disk size label junk < <(grep "^disk $1 " "$LAYOUT_FILE")
|
||||
+ read component disk size label junk < <(grep -E "^(disk|multipath) $1 " "$LAYOUT_FILE")
|
||||
test $disk || return 1
|
||||
|
||||
echo $label
|
||||
@ -3,7 +3,7 @@
|
||||
|
||||
Name: rear
|
||||
Version: 2.6
|
||||
Release: 25%{?dist}
|
||||
Release: 26%{?dist}
|
||||
Summary: Relax-and-Recover is a Linux disaster recovery and system migration tool
|
||||
URL: http://relax-and-recover.org/
|
||||
License: GPLv3
|
||||
@ -83,6 +83,14 @@ Patch117: rear-fix-ipv6.patch
|
||||
# https://github.com/rear/rear/pull/2576
|
||||
Patch118: rear-no-fat-16.patch
|
||||
|
||||
# Install GRUB on multipath disks
|
||||
# https://github.com/rear/rear/pull/3334
|
||||
Patch119: rear-multipath-bios-grub.patch
|
||||
|
||||
# Improve docs of layout configuration in user guide
|
||||
# https://github.com/rear/rear/pull/3125
|
||||
Patch121: rear-improve-layout-guide.patch
|
||||
|
||||
######################
|
||||
# downstream patches #
|
||||
######################
|
||||
@ -217,6 +225,10 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_docdir}/%{name}/
|
||||
|
||||
#-- CHANGELOG -----------------------------------------------------------------#
|
||||
%changelog
|
||||
* Tue Feb 11 2025 Pavel Cahyna <pcahyna@redhat.com> - 2.6-26
|
||||
- Install GRUB on multipath disks, PR 3334
|
||||
- Improve docs of layout configuration in user guide, PR 3125
|
||||
|
||||
* Sat Jul 20 2024 Pavel Cahyna <pcahyna@redhat.com> - 2.6-25
|
||||
- Backport PR 3250 to fix useless warning that libsystemd-core requires
|
||||
additional libraries and ReaR recovery system needs additional libraries
|
||||
|
||||
Loading…
Reference in New Issue
Block a user