diff options
author | Eric Hameleers <alien@slackware.com> | 2017-05-09 21:12:17 +0200 |
---|---|---|
committer | Eric Hameleers <alien@slackware.com> | 2017-05-09 21:12:17 +0200 |
commit | f42eb5d03f856af2cf57ef0c637ebd0476237a5b (patch) | |
tree | 5b5cc67beb3a306dbd73e2fa990ac8c335782c77 | |
parent | e6b397148603121d6ff099c3a71746f1360d35da (diff) | |
download | liveslak-f42eb5d03f856af2cf57ef0c637ebd0476237a5b.tar.gz liveslak-f42eb5d03f856af2cf57ef0c637ebd0476237a5b.tar.xz |
eliloconfig patch needs to be made release-specific
The script started to diverge in -current,
and the patch would no longer apply.
-rwxr-xr-x | make_slackware_live.sh | 14 | ||||
l---------[-rw-r--r--] | patches/eliloconfig.patch | 26 | ||||
-rw-r--r-- | patches/eliloconfig_14.2.patch | 25 | ||||
-rw-r--r-- | patches/eliloconfig_current.patch | 25 |
4 files changed, 63 insertions, 27 deletions
diff --git a/make_slackware_live.sh b/make_slackware_live.sh index 6f97b38..0309a47 100755 --- a/make_slackware_live.sh +++ b/make_slackware_live.sh @@ -1419,10 +1419,20 @@ if ls ${LIVE_ROOTDIR}/boot/vmlinuz-huge-* 1>/dev/null 2>/dev/null; then fi done if [ -f ${LIVE_ROOTDIR}/sbin/liloconfig ]; then - patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/liloconfig.patch + if [ -f ${LIVE_TOOLDIR}/patches/liloconfig_${SL_VERSION}.patch ]; then + LILOPATCH=liloconfig_${SL_VERSION}.patch + else + LILOPATCH=liloconfig.patch + fi + patch ${LIVE_ROOTDIR}/sbin/liloconfig ${LIVE_TOOLDIR}/patches/${LILOPATCH} fi if [ -f ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ]; then - patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/eliloconfig.patch + if [ -f ${LIVE_TOOLDIR}/patches/eliloconfig_${SL_VERSION}.patch ]; then + ELILOPATCH=eliloconfig_${SL_VERSION}.patch + else + ELILOPATCH=eliloconfig.patch + fi + patch ${LIVE_ROOTDIR}/usr/sbin/eliloconfig ${LIVE_TOOLDIR}/patches/${ELILOPATCH} fi # Fix some occurrences of '/usr/lib/setup/' that are covered by $PATH: sed -i -e 's,/usr/lib/setup/,,g' -e 's,:/usr/lib/setup,:/usr/share/${LIVEMAIN},g' ${LIVE_ROOTDIR}/usr/share/${LIVEMAIN}/* diff --git a/patches/eliloconfig.patch b/patches/eliloconfig.patch index 8b5fb47..68158ca 100644..120000 --- a/patches/eliloconfig.patch +++ b/patches/eliloconfig.patch @@ -1,25 +1 @@ ---- eliloconfig.orig 2016-04-01 20:37:40.000000000 +0200 -+++ eliloconfig 2016-11-12 01:32:24.804762277 +0100 -@@ -75,9 +75,9 @@ - exit - fi - --# If there's no vfat mounted on /boot/efi or /mnt/boot/efi, forget it: -+# If there's no vfat mounted on /boot/efi or $T_PX/boot/efi, forget it: - if ! mount | grep vfat | grep -wq /boot/efi ; then -- if ! mount | grep vfat | grep -wq /mnt/boot/efi ; then -+ if ! mount | grep vfat | grep -wq $T_PX/boot/efi ; then - if [ "$T_PX" = "/" ]; then - echo "ERROR: No EFI System Partition mounted on /boot/efi." - fi -@@ -90,8 +90,8 @@ - EFI_DEVICE=$(mount | grep vfat | grep -w /boot/efi | cut -b 1-8) - EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) - else -- EFI_DEVICE=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -b 1-8) -- EFI_PARTITION=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) -+ EFI_DEVICE=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -b 1-8) -+ EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) - fi - - # There better be a kernel: +eliloconfig_current.patch
\ No newline at end of file diff --git a/patches/eliloconfig_14.2.patch b/patches/eliloconfig_14.2.patch new file mode 100644 index 0000000..8b5fb47 --- /dev/null +++ b/patches/eliloconfig_14.2.patch @@ -0,0 +1,25 @@ +--- eliloconfig.orig 2016-04-01 20:37:40.000000000 +0200 ++++ eliloconfig 2016-11-12 01:32:24.804762277 +0100 +@@ -75,9 +75,9 @@ + exit + fi + +-# If there's no vfat mounted on /boot/efi or /mnt/boot/efi, forget it: ++# If there's no vfat mounted on /boot/efi or $T_PX/boot/efi, forget it: + if ! mount | grep vfat | grep -wq /boot/efi ; then +- if ! mount | grep vfat | grep -wq /mnt/boot/efi ; then ++ if ! mount | grep vfat | grep -wq $T_PX/boot/efi ; then + if [ "$T_PX" = "/" ]; then + echo "ERROR: No EFI System Partition mounted on /boot/efi." + fi +@@ -90,8 +90,8 @@ + EFI_DEVICE=$(mount | grep vfat | grep -w /boot/efi | cut -b 1-8) + EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) + else +- EFI_DEVICE=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -b 1-8) +- EFI_PARTITION=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) ++ EFI_DEVICE=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -b 1-8) ++ EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b 9- | tr -d [a-z]) + fi + + # There better be a kernel: diff --git a/patches/eliloconfig_current.patch b/patches/eliloconfig_current.patch new file mode 100644 index 0000000..0f1f7db --- /dev/null +++ b/patches/eliloconfig_current.patch @@ -0,0 +1,25 @@ +--- eliloconfig.orig 2017-05-04 23:26:50.000000000 +0200 ++++ eliloconfig 2017-05-09 20:58:13.801898765 +0200 +@@ -75,9 +75,9 @@ + exit + fi + +-# If there's no vfat mounted on /boot/efi or /mnt/boot/efi, forget it: ++# If there's no vfat mounted on /boot/efi or $T_PX/boot/efi, forget it: + if ! mount | grep vfat | grep -wq /boot/efi ; then +- if ! mount | grep vfat | grep -wq /mnt/boot/efi ; then ++ if ! mount | grep vfat | grep -wq $T_PX/boot/efi ; then + if [ "$T_PX" = "/" ]; then + echo "ERROR: No EFI System Partition mounted on /boot/efi." + fi +@@ -94,8 +94,8 @@ + EFI_PARTITION=$(mount | grep vfat | grep -w /boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z]) + else + mount | grep vfat | grep -w /mnt/boot/efi|grep -q nvme && DEVLEN=12 && PARTLEN=14 +- EFI_DEVICE=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -b 1-${DEVLEN}) +- EFI_PARTITION=$(mount | grep vfat | grep -w /mnt/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z]) ++ EFI_DEVICE=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -b 1-${DEVLEN}) ++ EFI_PARTITION=$(mount | grep vfat | grep -w $T_PX/boot/efi | cut -f 1 -d ' ' | cut -b ${PARTLEN}- | tr -d [a-z]) + fi + + # There better be a kernel: |