summaryrefslogtreecommitdiff
path: root/slackware-bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'slackware-bootstrap')
-rwxr-xr-xslackware-bootstrap/kernel9
-rwxr-xr-xslackware-bootstrap/slackpkg20
2 files changed, 21 insertions, 8 deletions
diff --git a/slackware-bootstrap/kernel b/slackware-bootstrap/kernel
index 7c8cc35..abfc29e 100755
--- a/slackware-bootstrap/kernel
+++ b/slackware-bootstrap/kernel
@@ -21,12 +21,12 @@ make modules_install
cp arch/x86/boot/bzImage /boot/vmlinuz-generic-6.15.2
-dirstr=$(ls /boot | grep vmlinuz-6.15.2)
+dirstr=$(ls /boot | grep vmlinuz-generic-6.15.2)
if [[ $dirstr != '' ]]; then
initrdcmd=$(/usr/share/mkinitrd/mkinitrd_command_generator.sh -k 6.15.2 | tail -1)
$initrdcmd
- cp System.map /boot/System.map-6.15.2.x64
- cp .config /boot/config-6.15.2
+ cp System.map /boot/System.map-6.15.2
+ cp .config /boot/config-6.15.2.x64
echo "==================== [ kernel update ] =========================="
echo "your kernel has been updated. in order to boot, you will need"
@@ -40,12 +40,11 @@ if [[ $dirstr != '' ]]; then
liloconfig
fi
-
rm /boot/vmlinuz
ln -s /boot/vmlinuz-generic-6.15.2 /boot/vmlinuz
rm /boot/System.map
- ln -s /boot/System.map-6.15.2.x64 /boot/System.map
+ ln -s /boot/System.map-6.15.2 /boot/System.map
rm /boot/config
ln -s /boot/config-6.15.2.x64 /boot/config
diff --git a/slackware-bootstrap/slackpkg b/slackware-bootstrap/slackpkg
index 80f1bb8..3a61323 100755
--- a/slackware-bootstrap/slackpkg
+++ b/slackware-bootstrap/slackpkg
@@ -63,9 +63,11 @@ slackpkg upgrade-all
cp -f $basedir/slackpkg-blacklist /etc/slackpkg/blacklist
cp -f $basedir/slackpkg.conf /etc/slackpkg/slackpkg.conf
+isgeneric=1
kernel=$(ls /boot | grep "vmlinuz-generic-" | sort | tail -1 | cut -d '-' -f 3)
if [[ $kernel == "" ]]; then # newer versions of slackware dont differentiate -generic and -huge
kernel=$(ls /boot | grep "vmlinuz-[0-9]" | sort | tail -1 | cut -d '-' -f 2)
+ isgeneric=0
fi
initrdcmd="$(/usr/share/mkinitrd/mkinitrd_command_generator.sh -k $kernel)"
@@ -85,13 +87,25 @@ if [[ $choice != 'n' ]]; then
fi
rm /boot/vmlinuz
-ln -s /boot/vmlinuz-generic-$kernel /boot/vmlinuz
+if [[ $isgeneric == 1 ]]; then
+ ln -s /boot/vmlinuz-generic-$kernel /boot/vmlinuz
+else
+ ln -s /boot/vmlinuz-$kernel /boot/vmlinuz
+fi
rm /boot/System.map
-ln -s /boot/System.map-generic-$kernel /boot/System.map
+if [[ $isgeneric == 1 ]]; then
+ ln -s /boot/System.map-generic-$kernel /boot/System.map
+else
+ ln -s /boot/System.map-$kernel /boot/System.map
+fi
rm /boot/config
-ln -s /boot/config-generic-$kernel.x64 /boot/config
+if [[ $isgeneric == 1 ]]; then
+ ln -s /boot/config-generic-$kernel.x64 /boot/config
+else
+ ln -s /boot/config-$kernel.x64 /boot/config
+fi
echo "================= [ kde purge ] =================="
echo "due to how install-new works, kde is always"