diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2018-11-28 07:25:32 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-11-28 17:59:44 +0100 |
| commit | 388986876373b8d6d9053c36196978464bd3362e (patch) | |
| tree | 2447049c22eb45bd771fa0132638b508ecff9992 /source/a/elilo/eliloconfig | |
| parent | bec25255185f3eb2e43abf4a495c275fe3c70fbf (diff) | |
| download | current-388986876373b8d6d9053c36196978464bd3362e.tar.gz current-388986876373b8d6d9053c36196978464bd3362e.tar.xz | |
Wed Nov 28 07:25:32 UTC 201820181128072532
a/elilo-3.16-x86_64-9.txz: Rebuilt.
eliloconfig: don't assume that mount output lists the / partition first.
a/f2fs-tools-1.12.0-x86_64-1.txz: Added.
a/kernel-generic-4.19.5-x86_64-1.txz: Upgraded.
a/kernel-huge-4.19.5-x86_64-1.txz: Upgraded.
CRYPTO_CRC32 m -> y
F2FS_FS m -> y
a/kernel-modules-4.19.5-x86_64-1.txz: Upgraded.
a/sysvinit-scripts-2.1-noarch-22.txz: Rebuilt.
rc.S: if we're using F2FS for the root filesystem, don't try to check it as
fsck.f2fs throws an error on trying to check a read-only filesystem.
d/clisp-2.49_20181112_df3b9f6fd-x86_64-1.txz: Upgraded.
d/kernel-headers-4.19.5-x86-1.txz: Upgraded.
k/kernel-source-4.19.5-noarch-1.txz: Upgraded.
l/graphite2-1.3.12-x86_64-1.txz: Added.
Required by harfbuzz in order to use it as a system library for TeXlive.
l/harfbuzz-2.1.3-x86_64-1.txz: Upgraded.
Requires graphite2-1.3.12.
t/texlive-2018.180822-x86_64-4.txz: Rebuilt.
Use system harfbuzz, not the bundled version.
isolinux/initrd.img: Rebuilt.
Activate LVM volumes at boot, not only when setup is run.
Make /etc/mtab a symlink to /proc/mounts on the installer.
On a freshly installed system, make /etc/mtab a symlink to /proc/mounts.
Include f2fs-tools on the installer.
Support installing on F2FS partitions.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/a/elilo/eliloconfig')
| -rw-r--r-- | source/a/elilo/eliloconfig | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/source/a/elilo/eliloconfig b/source/a/elilo/eliloconfig index 43616d563..e1866859a 100644 --- a/source/a/elilo/eliloconfig +++ b/source/a/elilo/eliloconfig @@ -63,7 +63,7 @@ if [ "$ROOT_DEVICE" = "" ]; then if [ -r $TMP/SeTrootdev ]; then ROOT_DEVICE="$(cat $TMP/SeTrootdev)" else - ROOT_DEVICE="$(mount | cut -f 1 -d ' ' | head -n 1)" + ROOT_DEVICE="$(mount | grep ' / ' | cut -f 1 -d ' ' | head -n 1)" fi fi @@ -196,9 +196,11 @@ entry? This is recommended.\n\nOld EFI boot menu entry:\n$ENTRY" 13 70 fi # Remove the boot entry: efibootmgr -q -B -b $(echo $line | cut -b5-8) + sleep 1 done efibootmgr -q -c -d $EFI_DEVICE -p $EFI_PARTITION -l "\\EFI\\Slackware\\elilo.efi" -L "Slackware" +sleep 1 efibootmgr -v | rev | cut -f 2- | rev | grep Boot0 | grep Slackware | while read line ; do # Reject entries that don't exactly match as not our business |