summaryrefslogtreecommitdiff
path: root/slackware-bootstrap
diff options
context:
space:
mode:
Diffstat (limited to 'slackware-bootstrap')
-rw-r--r--slackware-bootstrap/nvidia-driver2
-rwxr-xr-xslackware-bootstrap/slackpkg12
2 files changed, 10 insertions, 4 deletions
diff --git a/slackware-bootstrap/nvidia-driver b/slackware-bootstrap/nvidia-driver
index 2efa26b..4f3763e 100644
--- a/slackware-bootstrap/nvidia-driver
+++ b/slackware-bootstrap/nvidia-driver
@@ -7,7 +7,7 @@ slpkg --repository="sbo" -d nvidia-driver
cd /tmp/slpkg/nvidia-kernel
-kernelver=$(ls /boot | grep "vmlinuz-generic" | sort | tail -1)
+kernelver=$(ls /boot | grep "vmlinuz-generic-" | sort | tail -1)
chmod +x ./nvidia-kernel.SlackBuild
KERNEL=$kernelver ./nvidia-kernel.SlackBuild
diff --git a/slackware-bootstrap/slackpkg b/slackware-bootstrap/slackpkg
index 7fcf152..896d7be 100755
--- a/slackware-bootstrap/slackpkg
+++ b/slackware-bootstrap/slackpkg
@@ -51,20 +51,26 @@ echo "running full system update ..."
slackpkg update
slackpkg update gpg
slackpkg upgrade slackpkg
+slackpkg update gpg
+slackpkg upgrade gnupg gnupg2
+slackpkg update gpg
slackpkg install-new
slackpkg upgrade-all
+slackpkg update gpg
+slackpkg upgrade-all
cp $basedir/slackpkg-blacklist /etc/slackpkg/blacklist
-kernel=$(ls /boot | grep vmlinuz-generic | sort | tail -1 | cut -d '-' -f 2)
+kernel=$(ls /boot | grep "vmlinuz-generic-" | sort | tail -1 | cut -d '-' -f 2)
-initrdcmd=$(/usr/share/mkinitrd/mkinitrd_command_generator.sh -k $kernel | tail -1)
+initrdcmd="$(usr/share/mkinitrd/mkinitrd_command_generator.sh -k $kernel)"
+initrdcmd=$(echo $initrdcmd | tail -1)
$initrdcmd
rm /boot/vmlinuz
ln -s /boot/vmlinuz-generic-$kernel /boot/vmlinuz
rm /boot/System.map
-ln -s /boot/System.map-generic-$kernel.x64 /boot/System.map
+ln -s /boot/System.map-generic-$kernel /boot/System.map
rm /boot/config
ln -s /boot/config-generic-$kernel.x64 /boot/config