summaryrefslogtreecommitdiff
path: root/source/a/mkinitrd/setup.01.mkinitrd
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-01-26 04:15:08 +0000
committerEric Hameleers <alien@slackware.com>2019-01-26 08:59:46 +0100
commit22643bf37651b7677deb9e06c35d1c1b0c43b883 (patch)
treed01a458de09d6987e6c62d4485e4fe4e0e9a9d23 /source/a/mkinitrd/setup.01.mkinitrd
parent7ad185bd2d8fe579a2a8f288a911298e9b022c39 (diff)
downloadcurrent-22643bf37651b7677deb9e06c35d1c1b0c43b883.tar.gz
Sat Jan 26 04:15:08 UTC 201920190126041508
a/mkinitrd-1.4.11-x86_64-11.txz: Rebuilt. setup.01.mkinitrd: revert to the previous command line for mkinitrd_command_generator.sh (the new one fails when called from the installer).
Diffstat (limited to 'source/a/mkinitrd/setup.01.mkinitrd')
-rw-r--r--source/a/mkinitrd/setup.01.mkinitrd53
1 files changed, 42 insertions, 11 deletions
diff --git a/source/a/mkinitrd/setup.01.mkinitrd b/source/a/mkinitrd/setup.01.mkinitrd
index b8004470..8bddb5c5 100644
--- a/source/a/mkinitrd/setup.01.mkinitrd
+++ b/source/a/mkinitrd/setup.01.mkinitrd
@@ -8,31 +8,62 @@ fi
# Next, if boot/vmlinuz-generic is a symlink to a kernel, generate a ramdisk
# using the modules for that kernel:
-if [ -f $(readlink -f boot/vmlinuz-generic) ]; then
- KERNEL_SYMLINK="boot/vmlinuz-generic"
+KERNEL_SYMLINK="boot/vmlinuz-generic"
+if [ -L $KERNEL_SYMLINK ]; then
KERNEL_VERSION="$(readlink -f $KERNEL_SYMLINK | sed "s/-smp/_smp/g" | rev | cut -f 1 -d - | rev | sed "s/_smp/-smp/g")"
-dialog --title "GENERATING INITIAL RAMDISK" --infobox \
- "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \
+ # Sanity check. Not sure how/why, but there are reports we can arrive here
+ # without a $KERNEL_VERSION. The only way I see how is if the symlink were
+ # pointing to file with a malformed name
+ # (i.e. not ${KERNEL_SYMLINK}-${KERNEL_VERSION}).
+ # If ${KERNEL_VERSION} is blank, we'll bail out here.
+ # Any information on known cases that might cause this would be appreciated.
+ if [ ! "$KERNEL_VERSION" = "" ]; then
+ dialog --title "GENERATING INITIAL RAMDISK" --infobox \
+ "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \
kernel. The initial ramdisk contains kernel modules needed to mount the \
root partition, and must be regenerated whenever the kernel is updated. To \
regenerate the initrd, select this setup script from within pkgtool, or run \
'geninitrd' which will produce an initial ramdisk (/boot/initrd.gz) for the \
kernel pointed to by the /$KERNEL_SYMLINK symlink." 9 68
- chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null
+ chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null
+ else
+ dialog --title "INTERNAL ERROR" --msgbox \
+ "An internal error was detected. Please report the following information: \n\
+KERNEL_SYMLINK = $KERNEL_SYMLINK \n\
+KERNEL_SYMLINK (points to) = $(readlink -f $KERNEL_SYMLINK) \n\
+KERNEL_VERSION (is blank) \n\
+ls -l \$KERNEL_SYMLINK: \n\
+$(ls -l $KERNEL_SYMLINK)" 0 0
+ fi
fi
# If boot/vmlinuz-generic-smp is a symlink to a kernel, also include the
# modules for that kernel:
-if [ -f $(readlink -f boot/vmlinuz-generic-smp) ]; then
- KERNEL_SYMLINK="boot/vmlinuz-generic-smp"
+KERNEL_SYMLINK="boot/vmlinuz-generic-smp"
+if [ -L $KERNEL_SYMLINK ]; then
KERNEL_VERSION="$(readlink -f $KERNEL_SYMLINK | sed "s/-smp/_smp/g" | rev | cut -f 1 -d - | rev | sed "s/_smp/-smp/g")"
-dialog --title "GENERATING INITIAL RAMDISK" --infobox \
- "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \
+ # Sanity check. Not sure how/why, but there are reports we can arrive here
+ # without a $KERNEL_VERSION. The only way I see how is if the symlink were
+ # pointing to file with a malformed name
+ # (i.e. not ${KERNEL_SYMLINK}-${KERNEL_VERSION}).
+ # If ${KERNEL_VERSION} is blank, we'll bail out here.
+ # Any information on known cases that might cause this would be appreciated.
+ if [ ! "$KERNEL_VERSION" = "" ]; then
+ dialog --title "GENERATING INITIAL RAMDISK" --infobox \
+ "Generating an initial ramdisk for use with the $KERNEL_VERSION generic \
kernel. The initial ramdisk contains kernel modules needed to mount the \
root partition, and must be regenerated whenever the kernel is updated. To \
regenerate the initrd, select this setup script from within pkgtool, or run \
'geninitrd' which will produce an initial ramdisk (/boot/initrd.gz) for the \
kernel pointed to by the /$KERNEL_SYMLINK symlink." 9 68
- chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null
+ chroot . /usr/share/mkinitrd/mkinitrd_command_generator.sh -k $KERNEL_VERSION | sed "s/-c -k/-k/g" | chroot . bash 1> /dev/null 2> /dev/null
+ else
+ dialog --title "INTERNAL ERROR" --msgbox \
+ "An internal error was detected. Please report the following information: \n\
+KERNEL_SYMLINK = $KERNEL_SYMLINK \n\
+KERNEL_SYMLINK (points to) = $(readlink -f $KERNEL_SYMLINK) \n\
+KERNEL_VERSION (is blank) \n\
+ls -l \$KERNEL_SYMLINK: \n\
+$(ls -l $KERNEL_SYMLINK)" 0 0
+ fi
fi
-