diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-01-06 20:03:14 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-01-07 08:59:45 +0100 |
| commit | 4cc8e8065bec7cf7f1dfc8a8806a02075fa3c0f7 (patch) | |
| tree | 4788dd7df9ff468a23062e5011fef8e735a46f26 /source/installer | |
| parent | 29982cb6ad8ed85e9ec2dc4b74f02b3f10b89d6a (diff) | |
| download | current-4cc8e8065bec7cf7f1dfc8a8806a02075fa3c0f7.tar.gz current-4cc8e8065bec7cf7f1dfc8a8806a02075fa3c0f7.tar.xz | |
Sun Jan 6 20:03:14 UTC 201920190106200314
a/ncompress-4.2.4.5-x86_64-1.txz: Upgraded.
ap/man-db-2.8.5-x86_64-1.txz: Upgraded.
Added /etc/profile.d/man-db.{csh,sh} to pick a MANPAGER (defaults to 'most').
ap/powertop-2.10-x86_64-1.txz: Upgraded.
d/scons-3.0.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/installer')
| -rw-r--r-- | source/installer/ChangeLog.txt | 4 | ||||
| -rwxr-xr-x | source/installer/sources/initrd/usr/lib/setup/SeTkernel | 15 |
2 files changed, 15 insertions, 4 deletions
diff --git a/source/installer/ChangeLog.txt b/source/installer/ChangeLog.txt index d45c552e4..b14c77e4e 100644 --- a/source/installer/ChangeLog.txt +++ b/source/installer/ChangeLog.txt @@ -1,3 +1,7 @@ +Sun Jan 6 19:54:10 UTC 2019 + Account for .x64 suffix on /boot/config-* files with x86_64 when installing + the config files and /boot/config symlink. Thanks to Edward Grattan. ++--------------------------+ Wed Nov 28 05:31:04 UTC 2018 Activate LVM volumes at boot, not only when setup is run. Make /etc/mtab a symlink to /proc/mounts on the installer. diff --git a/source/installer/sources/initrd/usr/lib/setup/SeTkernel b/source/installer/sources/initrd/usr/lib/setup/SeTkernel index 6aa3091b1..9def33c8c 100755 --- a/source/installer/sources/initrd/usr/lib/setup/SeTkernel +++ b/source/installer/sources/initrd/usr/lib/setup/SeTkernel @@ -42,17 +42,24 @@ to continue." \ fi } +# Determine if we need the .x64 suffix for x86_64 config files: +if [ "$(uname -m)" = "x86_64" ]; then + CONFIGSUFFIX=".x64" +else + unset CONFIGSUFFIX +fi + ( cd boot if [ "$SLACK_KERNEL" = "generic.s" ]; then if [ -r vmlinuz-generic-$VERSION ]; then ln -sf vmlinuz-generic-$VERSION vmlinuz - ln -sf config-generic-$VERSION config + ln -sf config-generic-${VERSION}${CONFIGSUFFIX} config ln -sf System.map-huge-$VERSION System.map fi elif [ "$SLACK_KERNEL" = "huge.s" ]; then if [ -r vmlinuz-huge-$VERSION ]; then ln -sf vmlinuz-huge-$VERSION vmlinuz - ln -sf config-huge-$VERSION config + ln -sf config-huge-${VERSION}${CONFIGSUFFIX} config ln -sf System.map-huge-$VERSION System.map fi elif [ "$SLACK_KERNEL" = "hugesmp.s" ]; then @@ -86,13 +93,13 @@ before your system will be able to boot correctly." \ else rm -f $T_PX/boot/vmlinuz $T_PX/boot/config $T_PX/boot/System.map cp -a /$PLINK/kernels/$SLACK_KERNEL/bzImage $T_PX/boot/vmlinuz-$SLACK_KERNEL-$VERSION - cp -a /$PLINK/kernels/$SLACK_KERNEL/config $T_PX/boot/config-$SLACK_KERNEL-$VERSION + cp -a /$PLINK/kernels/$SLACK_KERNEL/config $T_PX/boot/config-$SLACK_KERNEL-${VERSION}${CONFIGSUFFIX} cp -a /$PLINK/kernels/$SLACK_KERNEL/System.map.gz $T_PX/boot ( cd $T_PX/boot gzip -d System.map.gz mv System.map System.map-$SLACK_KERNEL-$VERSION ln -sf vmlinuz-$SLACK_KERNEL-$VERSION vmlinuz - ln -sf config-$SLACK_KERNEL-$VERSION config + ln -sf config-$SLACK_KERNEL-${VERSION}${CONFIGSUFFIX} config ln -sf System.map-$SLACK_KERNEL-$VERSION System.map ) fi |