Skip to content

Commit

Permalink
Fedora 16 add-ons required for GRUB 2 and modification concerning SEL…
Browse files Browse the repository at this point in the history 
…inux

Fedora 15 and others still work with these modifications
  • Loading branch information
@gdha
gdha committed Sep 2, 2011
1 parent e437453 commit ccae513
Show file tree
Hide file tree
Showing 12 changed files with 186 additions and 8 deletions.
2 changes: 1 addition & 1 deletion usr/share/rear/backup/NETFS/GNU/Linux/60_start_selinux.sh
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Start SELinux if it was stopped - check presence of /tmp/selinux.mode
[ -f $TMP_DIR/selinux.mode ] && {
cat $TMP_DIR/selinux.mode > /selinux/enforce
cat $TMP_DIR/selinux.mode > $SELINUX_ENFORCE
Log "Restored original SELinux mode"
touch "${BUILD_DIR}/outputfs/${NETFS_PREFIX}/selinux.autorelabel"
Log "Trigger autorelabel (SELinux) file"
Expand Down
2 changes: 1 addition & 1 deletion usr/share/rear/backup/RSYNC/GNU/Linux/31_stop_selinux.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
case "$(basename ${BACKUP_PROG})" in
(tar|rsync)
#cat /selinux/enforce > $TMP_DIR/selinux.mode
echo "0" > /selinux/enforce
echo "0" > $SELINUX_ENFORCE
Log "Temporarely stop SELinux enforce mode with BACKUP=${BACKUP} and BACKUP_PROG=${BACKUP_PROG} backup"
;;
(*) # do nothing
Expand Down
2 changes: 1 addition & 1 deletion usr/share/rear/backup/RSYNC/GNU/Linux/61_start_selinux.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

[ -f $TMP_DIR/selinux.mode ] && {
touch "${TMP_DIR}/selinux.autorelabel"
cat $TMP_DIR/selinux.mode > /selinux/enforce
cat $TMP_DIR/selinux.mode > $SELINUX_ENFORCE
Log "Restored original SELinux mode"
case $RSYNC_PROTO in

Expand Down
3 changes: 3 additions & 0 deletions usr/share/rear/finalize/Fedora/i386/20_install_grub.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
# guarantee a correct boot-order, or even a working boot-lader config (eg.
# GRUB stage2 might not be at the exact same location)

# Only for GRUB Legacy - GRUB2 will be handled by its own script
[[ $(type -p grub) ]] || return

LogPrint "Installing GRUB boot loader"
mount -t proc none /mnt/local/proc

Expand Down
88 changes: 88 additions & 0 deletions usr/share/rear/finalize/Fedora/i386/21_install_grub2.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,88 @@
# This script is an improvement over the default grub-install '(hd0)'
#
# However the following issues still exist:
#
# * We don't know what the first disk will be, so we cannot be sure the MBR
# is written to the correct disk(s). That's why we make all disks bootable.
#
# * There is no guarantee that GRUB was the boot loader used originally. One
# solution is to save and restore the MBR for each disk, but this does not
# guarantee a correct boot-order, or even a working boot-lader config (eg.
# GRUB stage2 might not be at the exact same location)

# Only for GRUB2 - GRUB Legacy will be handled by its own script
[[ $(type -p grub-install) || $(type -p grub2-install) ]] || return

LogPrint "Installing GRUB2 boot loader"
mount -t proc none /mnt/local/proc
#for i in /dev /dev/pts /proc /sys; do mount -B $i /mnt/local${i} ; done

if [[ -r "$LAYOUT_FILE" && -r "$LAYOUT_DEPS" ]]; then

# Check if we find GRUB where we expect it
[[ -d "/mnt/local/boot" ]]
StopIfError "Could not find directory /boot"
[[ -d "/mnt/local/boot/grub2" ]]
StopIfError "Could not find directory /boot/grub2"
[[ -r "/mnt/local/boot/grub2/grub.cfg" ]]
LogIfError "Unable to find /boot/grub2/grub.cfg."

# Find exclusive partitions belonging to /boot (subtract root partitions from deps)
bootparts=$( (find_partition fs:/boot; find_partition fs:/) | sort | uniq -u )
grub_prefix=/grub
if [[ -z "$bootparts" ]]; then
bootparts=$(find_partition fs:/)
grub_prefix=/boot/grub2
fi
# Should never happen
[[ "$bootparts" ]]
BugIfError "Unable to find any /boot partitions"

# Find the disks that need a new GRUB MBR
disks=$(grep '^disk ' $LAYOUT_FILE | cut -d' ' -f2)
[[ "$disks" ]]
StopIfError "Unable to find any disks"

for disk in $disks; do
# Use first boot partition by default
part=$(echo $bootparts | cut -d' ' -f1)

# Use boot partition that matches with this disk, if any
for bootpart in $bootparts; do
bootdisk=$(find_disk "$bootpart")
if [[ "$disk" == "$bootdisk" ]]; then
part=$bootpart
break
fi
done

# Find boot-disk and partition number
bootdisk=$(find_disk "$part")
partnr=${part#$bootdisk}
partnr=${partnr#p}
partnr=$((partnr - 1))

if [[ "$bootdisk" == "$disk" ]]; then
#chroot /mnt/local grub2-mkconfig -o /boot/grub2/grub.cfg
#chroot /mnt/local grub2-install "$bootdisk"
grub2-install --root-directory=/mnt/local/ $bootdisk
else
chroot /mnt/local grub2-mkconfig -o /boot/grub2/grub.cfg
#chroot /mnt/local grub2-install "$bootdisk"
grub2-install --root-directory=/mnt/local/ $bootdisk
fi

if (( $? == 0 )); then
NOBOOTLOADER=
fi
done
fi

if [[ "$NOBOOTLOADER" ]]; then
if chroot /mnt/local grub2-install "$disk" >&2 ; then
NOBOOTLOADER=
fi
fi

#for i in /dev /dev/pts /proc /sys; do umount /mnt/local${i} ; done
umount /mnt/local/proc
15 changes: 15 additions & 0 deletions usr/share/rear/prep/GNU/Linux/30_include_grub_tools.sh
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# GRUB2 has much more commands then the legacy grub command, including modules
# check if we're using grub2 before doing something...
[ ! -d $VAR_LIB/recovery ] && mkdir -p $VAR_DIR/recovery
if has_binary grub-probe; then
grub-probe -t device /boot/grub > $VAR_DIR/recovery/bootdisk 2>/dev/null || return

This comment has been minimized.

Sign in to view

Copy link
@pcahyna

pcahyna Feb 22, 2022

Member

what's the purpose of the $VAR_DIR/recovery/bootdisk file? It does not seem to be used for anything.

This comment has been minimized.

Sign in to view

Copy link
@jsmeix

jsmeix Feb 23, 2022

Member

Only a blind guess based on what

# find usr/sbin/rear usr/share/rear/ -type f | xargs grep 'bootdisk'

shows:
Perhaps $VAR_DIR/recovery/bootdisk
was planned to be used during "rear recover" to reinstall GRUB
or it was used in former times during "rear recover" to reinstall GRUB
but current things happen different in finalize/Linux-i386/630_install_grub.sh
?
elif has_binary grub2-probe; then
grub2-probe -t device /boot/grub >$VAR_DIR/recovery/bootdisk 2>/dev/null || return
fi

This comment has been minimized.

Sign in to view

Copy link
@pcahyna

pcahyna Feb 22, 2022

Member

If we don't have grub-probe nor grub2-probe, we still continue. Is that intentional?

This comment has been minimized.

Sign in to view

Copy link
@gdha

gdha Feb 23, 2022

Author Member

@pcahyna @jsmeix it is an historical file to capture the type of bootdisk. However, it is redundant and no longer used. It can be removed from my moint of view.

This comment has been minimized.

Sign in to view

Copy link
@jsmeix

jsmeix Feb 23, 2022

Member

I don't know if it is intentional.

I think continuing in this particular case
at least doesn't do harm because then it only adds
some stuff to PROGS and COPY_AS_IS
but it won't cause errors when something is not there
in particular in build/GNU/Linux/100_copy_as_is.sh
which basically "succeeds" as in

# if ! tar -c /path/to/nowhere | cat ; then echo error ; else echo success ; fi
tar: Removing leading `/' from member names
tar: /path/to/nowhere: Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors
success

This comment has been minimized.

Sign in to view

Copy link
@pcahyna

pcahyna Feb 23, 2022

Member

@gdha thanks for the confirmation. I will submit a PR to remove this.

This comment has been minimized.

Sign in to view

Copy link
@pcahyna

pcahyna Jan 25, 2024

Member

PR #3136

PROGS=( "${PROGS[@]}"
grub-install grub-mkdevicemap grub-probe grub-set-default grub-mkconfig grub-reboot grub-setup grub-mkimage
grub2-install grub2-mkdevicemap grub2-probe grub2-set-default grub2-mkconfig grub2-reboot grub2-setup grub2-mkimage
)

COPY_AS_IS=( "${COPY_AS_IS[@]}" /etc/default/grub /etc/grub.d/* /etc/grub*.cfg /boot/grub* /usr/lib/grub* )
19 changes: 14 additions & 5 deletions usr/share/rear/prep/RSYNC/GNU/Linux/20_selinux_in_use.sh
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
# check if SELinux is in use, if not, just silently return
[[ -f /selinux/enforce ]] || return
[[ -f /selinux/enforce || -f /sys/fs/selinux/enforce ]] || return

if [ -f /selinux/enforce ]; then
SELINUX_ENFORCE=/selinux/enforce
elif [ -f /sys/fs/selinux/enforce ]; then
SELINUX_ENFORCE=/sys/fs/selinux/enforce
else
SELINUX_ENFORCE=
BugError "SELinux enforce file is not found. Please enhance this script."
fi

# check global settings (see default.conf) - non-empty means disable SELinux during backup
if [ -n "$BACKUP_SELINUX_DISABLE" ]; then
cat /selinux/enforce > $TMP_DIR/selinux.mode
cat $SELINUX_ENFORCE > $TMP_DIR/selinux.mode
RSYNC_SELINUX=
return
fi
Expand All @@ -19,7 +28,7 @@ case $(basename $BACKUP_PROG) in
# no xattrs compiled in remote rsync, so saving SELinux attributes are not possible
Log "WARNING: --xattrs not possible on system ($RSYNC_HOST) (no xattrs compiled in rsync)"
# $TMP_DIR/selinux.mode is a trigger during backup to disable SELinux
cat /selinux/enforce > $TMP_DIR/selinux.mode
cat $SELINUX_ENFORCE > $TMP_DIR/selinux.mode
RSYNC_SELINUX= # internal variable used in recover mode (empty means disable SELinux)
else
# if --xattrs is already set; no need to do it again
Expand All @@ -38,14 +47,14 @@ case $(basename $BACKUP_PROG) in
touch $TMP_DIR/force.autorelabel
else
# during backup we will disable SELinux
cat /selinux/enforce > $TMP_DIR/selinux.mode
cat $SELINUX_ENFORCE > $TMP_DIR/selinux.mode
# after reboot the restored system does a SELinux relabeling
fi
;;

(*)
# disable SELinux for unlisted BACKUP_PROGs
cat /selinux/enforce > $TMP_DIR/selinux.mode
cat $SELINUX_ENFORCE > $TMP_DIR/selinux.mode
;;

esac
7 changes: 7 additions & 0 deletions usr/share/rear/skel/Fedora/16/lib/systemd/system/udev-control.socket
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
[Unit]
Description=udev Control Socket
DefaultDependencies=no

[Socket]
Service=udev.service
ListenSequentialPacket=@/org/kernel/udev/udevd
8 changes: 8 additions & 0 deletions usr/share/rear/skel/Fedora/16/lib/systemd/system/udev-kernel.socket
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[Unit]
Description=udev Kernel Socket
DefaultDependencies=no

[Socket]
Service=udev.service
ReceiveBuffer=134217728
ListenNetlink=kobject-uevent 1
25 changes: 25 additions & 0 deletions usr/share/rear/skel/Fedora/16/lib/systemd/system/udev-settle.service
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# This service is usually not enabled by default. If enabled, it
# acts as a barrier for basic.target -- so all later services will
# wait for udev completely finishing its coldplug run.
#
# If needed, to work around broken or non-hotplug-aware services,
# it might be enabled unconditionally, or pulled-in on-demand by
# the services that assume a fully populated /dev at startup. It
# should not be used or pulled-in ever on systems without such
# legacy services running.

[Unit]
Description=udev Wait for Complete Device Initialization
DefaultDependencies=no
Wants=udev.service
After=udev-trigger.service
Before=basic.target

[Service]
Type=oneshot
TimeoutSec=180
RemainAfterExit=yes
ExecStart=/sbin/udevadm settle

[Install]
WantedBy=basic.target
10 changes: 10 additions & 0 deletions usr/share/rear/skel/Fedora/16/lib/systemd/system/udev-trigger.service
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
[Unit]
Description=udev Coldplug all Devices
Wants=udev.service
After=udev-kernel.socket udev-control.socket
DefaultDependencies=no

[Service]
Type=oneshot
RemainAfterExit=yes
ExecStart=/sbin/udevadm trigger --type=subsystems --action=add ; /sbin/udevadm trigger --type=devices --action=add
13 changes: 13 additions & 0 deletions usr/share/rear/skel/Fedora/16/lib/systemd/system/udev.service
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
[Unit]
Description=udev Kernel Device Manager
Wants=udev-control.socket udev-kernel.socket
After=udev-control.socket udev-kernel.socket
Before=basic.target
DefaultDependencies=no

[Service]
Type=notify
OOMScoreAdjust=-1000
Sockets=udev-control.socket udev-kernel.socket
Restart=on-failure
ExecStart=/sbin/udevd

0 comments on commit ccae513

Please sign in to comment.