From 75a4a592e5ccda30715f93563d741b83e0dcf39e Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Mon, 25 Apr 2011 13:37:00 +0000
Subject: Slackware 13.37

Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!

Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.

The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD.  Please consider supporting the Slackware
project by picking up a copy from store.slackware.com.  We're taking
pre-orders now, and offer a discount if you sign up for a subscription.

As always, thanks to the Slackware community for testing, suggestions,
and feedback.  :-)

Have fun!
---
 source/a/lilo/lilo.SlackBuild |  15 ++--
 source/a/lilo/liloconfig      | 194 ++++++++++++++++++++++++++----------------
 source/a/lilo/sl1337.bmp      | Bin 0 -> 14406 bytes
 source/a/lilo/slack64.bmp     | Bin 17318 -> 15634 bytes
 4 files changed, 127 insertions(+), 82 deletions(-)
 create mode 100644 source/a/lilo/sl1337.bmp

(limited to 'source/a/lilo')

diff --git a/source/a/lilo/lilo.SlackBuild b/source/a/lilo/lilo.SlackBuild
index e33c8778b..2e7902cde 100755
--- a/source/a/lilo/lilo.SlackBuild
+++ b/source/a/lilo/lilo.SlackBuild
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# Copyright 2008, 2009, 2010  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,7 +22,7 @@
 
 
 VERSION=${VERSION:-22.8}
-BUILD=${BUILD:-15}
+BUILD=${BUILD:-16}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -80,12 +80,11 @@ rm -rf $PKG/usr/doc/lilo-$VERSION
 mkdir -p $PKG/usr/doc/lilo-$VERSION
 cp -a CHANGES COPYING COPYRIGHT INCOMPAT QuickInst READM* doc sample \
   $PKG/usr/doc/lilo-$VERSION
-if [ -r $CWD/lilo-$VERSION.lsm ]; then
-  cp -a $CWD/lilo-$VERSION.lsm $PKG/usr/doc/lilo-$VERSION
-fi
-if [ -r $CWD/lilo-$VERSION.announce.txt ]; then
-  cp -a $CWD/lilo-$VERSION.announce.txt $PKG/usr/doc/lilo-$VERSION
-fi
+for bootsplash in $CWD/*.bmp ; do
+  cp -a $bootsplash $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash)
+  chown root:root $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash)
+  chmod 644 $PKG/usr/doc/lilo-$VERSION/sample/$(basename $bootsplash)
+done
 
 mv $PKG/usr/share/man $PKG/usr
 rmdir $PKG/usr/share
diff --git a/source/a/lilo/liloconfig b/source/a/lilo/liloconfig
index e786e7522..7dccd3d62 100644
--- a/source/a/lilo/liloconfig
+++ b/source/a/lilo/liloconfig
@@ -2,7 +2,7 @@
 #
 # Copyright 1994, 1998, 1999 Patrick Volkerding, Moorhead, Minnesota USA
 # Copyright 2002, 2003  Slackware Linux, Inc, Concord, CA
-# Copyright 2007, 2008  Patrick Volkerding, Sebeka, Minnesota, USA
+# Copyright 2007, 2008, 2011  Patrick Volkerding, Sebeka, Minnesota, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -46,12 +46,18 @@ if [ ! -d "$T_PX" ]; then
     elif [ -r /usr/lib/setup/setup ]; then
       T_PX=/mnt
     else
-      # We will have to assume we've on an installed and running system.
+      # We will have to assume we're on an installed and running system.
       T_PX=/
     fi
   fi
 fi
 
+# Determine LILO documentation directory:
+LILODOCDIR="$(ls -d /usr/doc/lilo-* | tail -n 1)"
+if [ ! -d "$LILODOCDIR" ]; then
+  LILODOCDIR="/usr/doc/lilo/"
+fi
+
 # If there's no boot_message.txt, start the header for one now:
 if [ ! -r $T_PX/boot/boot_message.txt ]; then
  cat << EOF > $T_PX/boot/boot_message.txt
@@ -132,24 +138,26 @@ EO_BMP
 use_framebuffer() {
 if cat /proc/devices | grep "29 fb" 1> /dev/null ; then
   dialog --title "CONFIGURE LILO TO USE FRAME BUFFER CONSOLE?" \
-  --default-item 1024x768x256 \
+  --default-item standard \
   --menu "Looking at /proc/devices, it seems your kernel has support for \
-the Linux frame buffer console.  If we enable this in /etc/lilo.conf, it \
+the VESA frame buffer console.  If we enable this in /etc/lilo.conf, it \
 will allow more rows and columns of text on the screen and give you a cool \
 penguin logo at boot time.  However, the frame buffer text console is \
 slower than a standard text console.  In addition, not every video card \
-or monitor supports all of these video modes.  Would you like to use the \
-frame buffer console, or the standard Linux console?" 0 0 0 \
+or monitor supports all of these video modes, and some X drivers could be \
+confused by them.  Would you like to use the frame buffer console, \
+or the standard Linux console?" 0 0 0 \
   "standard" "Use the standard Linux console (the safe choice)" \
-  "640x480x256" "Frame buffer console, 640x480x256" \
-  "800x600x256" "Frame buffer console, 800x600x256" \
-  "1024x768x256" "Frame buffer console, 1024x768x256" \
-  "640x480x32k" "Frame buffer console, 640x480x32k" \
-  "800x600x32k" "Frame buffer console, 800x600x32k" \
-  "1024x768x32k" "Frame buffer console, 1024x768x32k" \
+  "ask" "Ask about using VESA modes at boot; time out to standard" \
   "640x480x64k" "Frame buffer console, 640x480x64k" \
   "800x600x64k" "Frame buffer console, 800x600x64k" \
   "1024x768x64k" "Frame buffer console, 1024x768x64k" \
+  "640x480x32k" "Frame buffer console, 640x480x32k" \
+  "800x600x32k" "Frame buffer console, 800x600x32k" \
+  "1024x768x32k" "Frame buffer console, 1024x768x32k" \
+  "640x480x256" "Frame buffer console, 640x480x256" \
+  "800x600x256" "Frame buffer console, 800x600x256" \
+  "1024x768x256" "Frame buffer console, 1024x768x256" \
   2> $TMP/reply
   if [ $? = 1 -o $? = 255 ]; then
     exit
@@ -289,14 +297,28 @@ EOF
 boot = $ROOT_DEVICE
 #delay = 5
 EOF
-   if [ "$CONSOLETYPE" = "standard" ]; then
+   if [ $CONSOLETYPE = standard ]; then
      cat << EOF >> $T_PX/etc/lilo.conf
+# Normal VGA console
 vga = normal
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+   elif [ $CONSOLETYPE = ask ]; then
+     cat << EOF >> $T_PX/etc/lilo.conf
+# Ask for video mode at boot (time out to normal in 30s)
+vga = ask
+# Normal VGA console
+#vga = normal
 EOF
    else
      cat << EOF >> $T_PX/etc/lilo.conf
 # VESA framebuffer at $CONSOLETYPE
 vga = $CONSOLENUM
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+# Normal VGA console
+#vga = normal
 EOF
    fi
    cat << EOF >> $T_PX/etc/lilo.conf
@@ -406,55 +428,50 @@ timeout = 1200
 change-rules
   reset
 EOF
- if [ "$CONSOLETYPE" = "standard" ]; then
+ if [ $CONSOLETYPE = standard ]; then
    cat << EOF >> $T_PX/etc/lilo.conf
 # Normal VGA console
 vga = normal
-# VESA framebuffer console @ 1024x768x64k
-# vga=791
-# VESA framebuffer console @ 1024x768x32k
-# vga=790
-# VESA framebuffer console @ 1024x768x256
-# vga=773
-# VESA framebuffer console @ 800x600x64k
-# vga=788
-# VESA framebuffer console @ 800x600x32k
-# vga=787
-# VESA framebuffer console @ 800x600x256
-# vga=771
-# VESA framebuffer console @ 640x480x64k
-# vga=785
-# VESA framebuffer console @ 640x480x32k
-# vga=784
-# VESA framebuffer console @ 640x480x256
-# vga=769
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+ elif [ $CONSOLETYPE = ask ]; then
+   cat << EOF >> $T_PX/etc/lilo.conf
+# Ask for video mode at boot (time out to normal in 30s)
+vga = ask
+# Normal VGA console
+#vga = normal
 EOF
  else
    cat << EOF >> $T_PX/etc/lilo.conf
 # VESA framebuffer console @ $CONSOLETYPE
 vga = $CONSOLENUM
 # Normal VGA console
-# vga = normal
+#vga = normal
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+ fi
+cat << EOF >> $T_PX/etc/lilo.conf
 # VESA framebuffer console @ 1024x768x64k
-# vga=791
+#vga=791
 # VESA framebuffer console @ 1024x768x32k
-# vga=790
+#vga=790
 # VESA framebuffer console @ 1024x768x256
-# vga=773
+#vga=773
 # VESA framebuffer console @ 800x600x64k
-# vga=788
+#vga=788
 # VESA framebuffer console @ 800x600x32k
-# vga=787
+#vga=787
 # VESA framebuffer console @ 800x600x256
-# vga=771
+#vga=771
 # VESA framebuffer console @ 640x480x64k
-# vga=785
+#vga=785
 # VESA framebuffer console @ 640x480x32k
-# vga=784
+#vga=784
 # VESA framebuffer console @ 640x480x256
-# vga=769
+#vga=769
 EOF
- fi
 cat << EOF >> $T_PX/etc/lilo.conf
 # End LILO global section
 EOF
@@ -551,8 +568,35 @@ name?" 7 60
  fi
 }
 
+checkbootsplash()
+{
+ if [ "$(uname -m)" = "x86_64" ]; then
+  if [ -r $LILODOCDIR/sample/slack64.bmp ]; then
+   cp -a $LILODOCDIR/sample/slack64.bmp /boot/slack.bmp
+  fi
+ else
+  if [ -r $LILODOCDIR/sample/slack.bmp ]; then
+   cp -a $LILODOCDIR/sample/slack.bmp /boot/slack.bmp
+  fi
+ fi
+ if [ -r $HOME/1337 ]; then
+  if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then
+   cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp
+  fi
+ fi
+ # Thanks to amrit@slackware.com:
+ if grep -wq 13.37.0 /etc/slackware-version ; then
+  if ls -l /etc/lilo.conf | grep -q 13:37 ; then
+   if [ -r $LILODOCDIR/sample/sl1337.bmp ]; then
+    cp -a $LILODOCDIR/sample/sl1337.bmp /boot/slack.bmp
+   fi
+  fi
+ fi
+}
+
 installcolor()
 {
+ checkbootsplash;
  dialog --infobox "\nInstalling the Linux Loader..." 5 40
  if [ "$T_PX" = "/" ]; then
   lilo 1> /dev/null 2> /etc/lilo-error.$$
@@ -586,7 +630,7 @@ has not been correctly installed.  You'll have to use a bootdisk \
 to start your \
 machine instead.  It should still be possible to get LILO working by \
 editing the /etc/lilo.conf and reinstalling LILO manually.  See the \
-LILO man page and documentation in /usr/doc/lilo/ for more help.  \
+LILO man page and documentation in $LILODOCDIR for more help.  \
 The error message may be seen above.
 EOF
   dialog --msgbox "$(cat /etc/lilo-error.$$)" 0 0
@@ -595,6 +639,7 @@ EOF
 
 installtext()
 {
+ checkbootsplash;
  echo "Installing the Linux Loader..."
  if [ "$T_PX" = "/" ]; then
   lilo
@@ -629,7 +674,7 @@ Sorry, but the attempt to install LILO has returned an error, so LILO
 has not been correctly installed.  You'll have to use a bootdisk to
 start your machine instead.  It should still be possible to get LILO
 working by editing the /etc/lilo.conf and reinstalling LILO manually.
-See the LILO man page and documentation in /usr/doc/lilo/ for more
+See the LILO man page and documentation in $LILODOCDIR for more
 help.
 
 EOF
@@ -888,31 +933,27 @@ EOF
      cat << EOF >> $TMP/lilo.conf
 # Normal VGA console
 vga = normal
-# VESA framebuffer console @ 1024x768x64k
-# vga=791
-# VESA framebuffer console @ 1024x768x32k
-# vga=790
-# VESA framebuffer console @ 1024x768x256
-# vga=773
-# VESA framebuffer console @ 800x600x64k
-# vga=788
-# VESA framebuffer console @ 800x600x32k
-# vga=787
-# VESA framebuffer console @ 800x600x256
-# vga=771
-# VESA framebuffer console @ 640x480x64k
-# vga=785
-# VESA framebuffer console @ 640x480x32k
-# vga=784
-# VESA framebuffer console @ 640x480x256
-# vga=769
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+   elif [ "$CONSOLETYPE" = "ask" ]; then
+     cat << EOF >> $TMP/lilo.conf
+# Ask for video mode at boot (time out to normal in 30s)
+vga = ask
+# Normal VGA console
+#vga = normal
 EOF
    else
      cat << EOF >> $TMP/lilo.conf
 # VESA framebuffer console @ $CONSOLETYPE
 vga = $CONSOLENUM
 # Normal VGA console
-# vga = normal
+#vga = normal
+# Ask for video mode at boot (time out to normal in 30s)
+#vga = ask
+EOF
+   fi
+   cat << EOF >> $TMP/lilo.conf
 # VESA framebuffer console @ 1024x768x64k
 # vga=791
 # VESA framebuffer console @ 1024x768x32k
@@ -932,7 +973,6 @@ vga = $CONSOLENUM
 # VESA framebuffer console @ 640x480x256
 # vga=769
 EOF
-   fi
    cat << EOF >> $TMP/lilo.conf
 # ramdisk = 0     # paranoia setting
 # End LILO global section
@@ -940,14 +980,20 @@ EOF
     HDR="yes"
   elif [ "$REPLY" = "Linux" ]; then
    if [ "$HDR" = "yes" ]; then
-    echo "These are your Linux partitions:" > $TMP/tmpmsg
-    echo >> $TMP/tmpmsg
-    echo "   Device Boot      Start         End      Blocks   Id  System" >> $TMP/tmpmsg
-    PROBE -l | grep "Linux$" | sort >> $TMP/tmpmsg
-    echo >> $TMP/tmpmsg
-    echo "Which one would you like LILO to boot?" >> $TMP/tmpmsg
-    dialog --title "SELECT LINUX PARTITION" --no-collapse --inputbox \
-"`cat $TMP/tmpmsg`" 21 74 2> $TMP/reply
+    if [ "$ROOT_DEVICE" != "" ]; then
+     DEFROOT="--default-item $ROOT_DEVICE"
+    fi
+    echo "dialog --title \"SELECT LINUX PARTITION\" $DEFROOT --menu \\" > $TMP/tmpmsg
+    echo "\"Which Linux partition would you like LILO to boot?\n\
+\n\
+   Partition             Start         End     Sectors   ID\" 22 74 13 \\" >> $TMP/tmpmsg
+    PROBE -l 2> /dev/null | grep "Linux$" | sort | while read STR; do
+     STR1="$(echo -n "$STR" | cut -f 1 -d ' ')"
+     STR2="$(echo -n "$STR" | cut -f 2- -d ' ')"
+     echo "\"$STR1\" \"$STR2\" \\" >> $TMP/tmpmsg
+    done
+    echo "2> $TMP/reply" >> $TMP/tmpmsg
+    . $TMP/tmpmsg
     if [ $? = 1 -o $? = 255 ]; then
      rm $TMP/tmpmsg
      continue
@@ -958,7 +1004,7 @@ EOF
     if [ ! $? = 0 ]; then
      continue;
     fi
-    dialog --title "SELECT PARTITION NAME" --inputbox \
+    dialog --title "SELECT PARTITION NAME FOR $LINUX_PART" --inputbox \
 "Now you must select a short, unique name for this partition. \
 You'll use this name if you specify a partition to boot at the \
 LILO prompt. 'Linux' might not be a bad choice. THIS MUST BE A \
diff --git a/source/a/lilo/sl1337.bmp b/source/a/lilo/sl1337.bmp
new file mode 100644
index 000000000..34a62d1bf
Binary files /dev/null and b/source/a/lilo/sl1337.bmp differ
diff --git a/source/a/lilo/slack64.bmp b/source/a/lilo/slack64.bmp
index 464e4683e..0d17f2346 100644
Binary files a/source/a/lilo/slack64.bmp and b/source/a/lilo/slack64.bmp differ
-- 
cgit v1.2.3-65-gdbad