diff options
| author | Adrien Nader <adrien@notk.org> | 2016-07-12 07:40:07 +0200 |
|---|---|---|
| committer | Adrien Nader <adrien@notk.org> | 2016-07-12 07:40:07 +0200 |
| commit | a3cbfe256236102e7979307472fcbe265da657f1 (patch) | |
| tree | 246195f4b39a0c73986873bf561f649035996ce4 /slackware64-current/source/a/lilo | |
| parent | 422a34b15689430738bc75fa013e4e7c25fe7cb0 (diff) | |
Tue Jul 12 03:48:34 UTC 2016
a/etc-14.2-x86_64-8.txz: Rebuilt.
In /etc/profile.d/lang.{csh,sh}.new, make en_US.UTF-8 the default locale.
a/kernel-generic-4.4.15-x86_64-1.txz: Upgraded.
a/kernel-huge-4.4.15-x86_64-1.txz: Upgraded.
a/kernel-modules-4.4.15-x86_64-1.txz: Upgraded.
a/lilo-24.2-x86_64-3.txz: Rebuilt.
In liloconfig: Skip the menu asking if the user wants a UTF-8 virtual
console, and use the kernel default (currently this is UTF-8 active).
d/kernel-headers-4.4.15-x86-1.txz: Upgraded.
k/kernel-source-4.4.15-noarch-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'slackware64-current/source/a/lilo')
| -rwxr-xr-x | slackware64-current/source/a/lilo/lilo.SlackBuild | 2 | ||||
| -rw-r--r-- | slackware64-current/source/a/lilo/liloconfig | 36 |
2 files changed, 19 insertions, 19 deletions
diff --git a/slackware64-current/source/a/lilo/lilo.SlackBuild b/slackware64-current/source/a/lilo/lilo.SlackBuild index ec4a3ba8c..3b2ba8c71 100755 --- a/slackware64-current/source/a/lilo/lilo.SlackBuild +++ b/slackware64-current/source/a/lilo/lilo.SlackBuild @@ -22,7 +22,7 @@ VERSION=${VERSION:-24.2} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then diff --git a/slackware64-current/source/a/lilo/liloconfig b/slackware64-current/source/a/lilo/liloconfig index f498da727..c8e25174d 100644 --- a/slackware64-current/source/a/lilo/liloconfig +++ b/slackware64-current/source/a/lilo/liloconfig @@ -292,12 +292,12 @@ simplelilo() fi APPEND="`cat $TMP/reply`" - ask_utf; - if [ $? = 1 -o $? = 255 ]; then - UTFVT="vt.default_utf8=0" - else - UTFVT="vt.default_utf8=1" - fi + #ask_utf; + #if [ $? = 1 -o $? = 255 ]; then + # UTFVT="vt.default_utf8=0" + #else + # UTFVT="vt.default_utf8=1" + #fi if PROBE -l | grep 'OS/2 Boot Manager' 1> /dev/null 2> /dev/null ; then dialog --title "OS/2 BOOT MANAGER FOUND" --yesno \ @@ -322,10 +322,10 @@ Manager compatible way?" 11 65 # Start LILO global section # EOF - if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then + #if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then echo "# Append any additional kernel parameters:" >> $T_PX/etc/lilo.conf echo "append=\"$APPEND $UTFVT\"" >> $T_PX/etc/lilo.conf - fi + #fi cat << EOF >> $T_PX/etc/lilo.conf boot = $ROOT_DEVICE #delay = 5 @@ -425,10 +425,10 @@ Which option would you like?" \ # # Start LILO global section EOF - if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then + #if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then echo "# Append any additional kernel parameters:" >> $T_PX/etc/lilo.conf echo "append=\"$APPEND $UTFVT\"" >> $T_PX/etc/lilo.conf - fi + #fi cat << EOF >> $T_PX/etc/lilo.conf boot = $LILO_TARGET @@ -837,12 +837,12 @@ Which option would you like?" 21 73 8 \ else APPEND="`cat $TMP/reply`" fi - ask_utf; - if [ $? = 1 -o $? = 255 ]; then - UTFVT="vt.default_utf8=0" - else - UTFVT="vt.default_utf8=1" - fi + #ask_utf; + #if [ $? = 1 -o $? = 255 ]; then + # UTFVT="vt.default_utf8=0" + #else + # UTFVT="vt.default_utf8=1" + #fi use_framebuffer; dialog --title "SELECT LILO TARGET LOCATION" $DEFAULT --menu "LILO can be installed \ to a variety of places: \ @@ -962,10 +962,10 @@ message = /boot/boot_message.txt EOF fi - if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then + #if [ ! "$APPEND" = "" -o ! "$UTFVT" = "" ]; then echo "# Append any additional kernel parameters:" >> $TMP/lilo.conf echo "append=\"$APPEND $UTFVT\"" >> $TMP/lilo.conf - fi + #fi cat << EOF >> $TMP/lilo.conf $PROMPT $TIMEOUT |